Merge pull request #335 from MohamedRejeb/1.x

Fix $ sign disappears issue when trying to encode RichTextState from Markdown
MohamedRejeb · Aug 23, 2024 · a507cec · a507cec
2 parents 14286f0 + dbac6e0
commit a507cec
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 0 deletions.
diff --git a/...monMain/kotlin/com/mohamedrejeb/richeditor/parser/markdown/RichTextStateMarkdownParser.kt b/...monMain/kotlin/com/mohamedrejeb/richeditor/parser/markdown/RichTextStateMarkdownParser.kt
@@ -24,6 +24,7 @@ import org.intellij.markdown.ast.ASTNode
 import org.intellij.markdown.ast.findChildOfType
 import org.intellij.markdown.ast.getTextInNode
 import org.intellij.markdown.flavours.gfm.GFMElementTypes
+import org.intellij.markdown.flavours.gfm.GFMTokenTypes
 
 internal object RichTextStateMarkdownParser : RichTextStateParser<String> {
 
@@ -128,6 +129,12 @@ internal object RichTextStateMarkdownParser : RichTextStateParser<String> {
                         currentRichParagraph.children.add(newRichSpan)
                         currentRichSpan = newRichSpan
                     }
+
+                    if (
+                        openedNodes.getOrNull(openedNodes.lastIndex - 1)?.type != GFMElementTypes.INLINE_MATH &&
+                        node.type == GFMTokenTypes.DOLLAR
+                    )
+                        newRichSpan.text = "$".repeat(node.endOffset - node.startOffset)
                 }
             },
             onCloseNode = { node ->

diff --git a/...est/kotlin/com.mohamedrejeb.richeditor/parser/markdown/RichTextStateMarkdownParserTest.kt b/...est/kotlin/com.mohamedrejeb.richeditor/parser/markdown/RichTextStateMarkdownParserTest.kt
@@ -149,6 +149,45 @@ class RichTextStateMarkdownParserTest {
         )
     }
 
+    @Test
+    fun testEncodeMarkdownWithSingleDollar() {
+        val markdown = "Hello World $100!"
+        val expectedText = "Hello World $100!"
+        val state = RichTextStateMarkdownParser.encode(markdown)
+        val actualText = state.annotatedString.text
+
+        assertEquals(
+            expected = expectedText,
+            actual = actualText,
+        )
+    }
+
+    @Test
+    fun testEncodeMarkdownWithDoubleDollar() {
+        val markdown = "Hello World $$100!"
+        val expectedText = "Hello World $$100!"
+        val state = RichTextStateMarkdownParser.encode(markdown)
+        val actualText = state.annotatedString.text
+
+        assertEquals(
+            expected = expectedText,
+            actual = actualText,
+        )
+    }
+
+    @Test
+    fun testEncodeMarkdownWithInlineMath() {
+        val markdown = "Hello World \$100$!"
+        val expectedText = "Hello World 100!"
+        val state = RichTextStateMarkdownParser.encode(markdown)
+        val actualText = state.annotatedString.text
+
+        assertEquals(
+            expected = expectedText,
+            actual = actualText,
+        )
+    }
+
     /**
      * Decode tests
      */