Update math support to trim surrounding backticks

JetBrains · May 7, 2024 · 7d4c8f6 · 7d4c8f6
1 parent 0642c8a
commit 7d4c8f6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/commonMain/kotlin/org/intellij/markdown/flavours/gfm/GFMFlavourDescriptor.kt b/src/commonMain/kotlin/org/intellij/markdown/flavours/gfm/GFMFlavourDescriptor.kt
@@ -43,8 +43,8 @@ open class GFMFlavourDescriptor(
     override val sequentialParserManager = object : SequentialParserManager() {
         override fun getParserSequence(): List<SequentialParser> {
             return listOf(AutolinkParser(listOf(MarkdownTokenTypes.AUTOLINK, GFMTokenTypes.GFM_AUTOLINK)),
-                    MathParser(),
                     BacktickParser(),
+                    MathParser(),
                     ImageParser(),
                     InlineLinkParser(),
                     ReferenceLinkParser(),

diff --git a/src/commonMain/kotlin/org/intellij/markdown/flavours/gfm/GFMGeneratingProviders.kt b/src/commonMain/kotlin/org/intellij/markdown/flavours/gfm/GFMGeneratingProviders.kt
@@ -136,11 +136,19 @@ open class TableAwareCodeSpanGeneratingProvider : GeneratingProvider {
 internal class MathGeneratingProvider(private val inline: Boolean = false): GeneratingProvider {
     override fun processNode(visitor: HtmlGenerator.HtmlGeneratingVisitor, text: String, node: ASTNode) {
         val nodes = node.children.subList(1, node.children.size - 1)
-        val output = nodes.joinToString(separator = "") { HtmlGenerator.leafText(text, it, false) }.trim()
+        val output = nodes.joinToString(separator = "") { HtmlGenerator.leafText(text, it, false) }.trimSurroundingBackticksAndWhitespaces()
         visitor.consumeTagOpen(node, "span", "class=\"math\"", "inline = \"$inline\"")
         visitor.consumeHtml(output)
         visitor.consumeTagClose("span")
     }
+
+    private fun String.trimSurroundingBackticksAndWhitespaces(): String {
+        var i = 0
+        while (length - i > 2 && this[i] == '`' && this[length - 1 - i] == '`') {
+            i++
+        }
+        return substring(i, length - i).trim()
+    }
 }
 
 internal class TablesGeneratingProvider : GeneratingProvider {