Merge pull request #6357 from cloudrac3r/fix-formatted-message-display

Fix formatted_body being parsed as Markdown

changelog.d/6357.bugfix

@@ -0,0 +1 @@
+Fix backslash escapes in formatted messages

vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt

@@ -30,8 +30,11 @@ import io.noties.markwon.PrecomputedFutureTextSetterCompat
 import io.noties.markwon.ext.latex.JLatexMathPlugin
 import io.noties.markwon.ext.latex.JLatexMathTheme
 import io.noties.markwon.html.HtmlPlugin
+import io.noties.markwon.inlineparser.HtmlInlineProcessor
+import io.noties.markwon.inlineparser.MarkwonInlineParser
 import io.noties.markwon.inlineparser.MarkwonInlineParserPlugin
 import org.commonmark.node.Node
+import org.commonmark.parser.Parser
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -63,14 +66,25 @@ class EventHtmlRenderer @Inject constructor(
                                 }
                     }
                 })
-                .usePlugin(MarkwonInlineParserPlugin.create())
                 .usePlugin(JLatexMathPlugin.create(44F) { builder ->
                     builder.inlinesEnabled(true)
                     builder.theme().inlinePadding(JLatexMathTheme.Padding.symmetric(24, 8))
                 })
     } else {
         builder
-    }.textSetter(PrecomputedFutureTextSetterCompat.create()).build()
+    }
+        .usePlugin(
+            MarkwonInlineParserPlugin.create(
+                MarkwonInlineParser.factoryBuilderNoDefaults().addInlineProcessor(HtmlInlineProcessor())
+            )
+        )
+        .usePlugin(object : AbstractMarkwonPlugin() {
+            override fun configureParser(builder: Parser.Builder) {
+                builder.enabledBlockTypes(kotlin.collections.emptySet())
+            }
+        })
+        .textSetter(PrecomputedFutureTextSetterCompat.create())
+        .build()
 
     val plugins: List<MarkwonPlugin> = markwon.plugins