Merge branch 'main' into spell-check-test

MohamedRejeb · Dec 9, 2024 · 4776c1e · 4776c1e
2 parents 87905ce + 612f9f7
commit 4776c1e
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 1 deletion.
diff --git a/...monMain/kotlin/com/mohamedrejeb/richeditor/parser/markdown/RichTextStateMarkdownParser.kt b/...monMain/kotlin/com/mohamedrejeb/richeditor/parser/markdown/RichTextStateMarkdownParser.kt
@@ -60,6 +60,8 @@ internal object RichTextStateMarkdownParser : RichTextStateParser<String> {
         }
 
         fun onText(text: String) {
+            val text = text.replace('\n', ' ')
+
             if (text.isEmpty()) return
 
             if (richParagraphList.isEmpty())
@@ -183,7 +185,10 @@ internal object RichTextStateMarkdownParser : RichTextStateParser<String> {
                         newRichSpan.text = "$".repeat(node.endOffset - node.startOffset)
                 }
 
-                if (node.type == GFMTokenTypes.GFM_AUTOLINK) {
+                if (
+                    node.type == GFMTokenTypes.GFM_AUTOLINK ||
+                    node.type == MarkdownTokenTypes.CODE_LINE
+                ) {
                     onText(node.getTextInNode(input).toString())
                 }
             },

diff --git a/...tlin/com.mohamedrejeb.richeditor/parser/markdown/RichTextStateMarkdownParserEncodeTest.kt b/...tlin/com.mohamedrejeb.richeditor/parser/markdown/RichTextStateMarkdownParserEncodeTest.kt
@@ -427,4 +427,50 @@ class RichTextStateMarkdownParserEncodeTest {
         assertEquals("Prompt\nEmphasis", state.toText())
     }
 
+    @Test
+    fun testEncodeWithLeadingSpaces() {
+        val markdown = """First line
+            
+    indented line"""
+
+        val state = RichTextStateMarkdownParser.encode(markdown)
+
+        val parsedString = state.toText()
+
+        assertEquals(
+            expected = """
+                First line
+                
+                indented line
+            """.trimIndent(),
+            actual = parsedString
+        )
+    }
+
+    @Test
+    fun testEncodeInlineCodeInDifferentLines() {
+        val markdown =
+            """
+                Hello `World!
+                Kotlin` MP
+            """.trimIndent()
+
+        val state = RichTextStateMarkdownParser.encode(markdown)
+
+        val parsedString = state.toText()
+
+        assertEquals(
+            expected =
+                """
+                    Hello World! Kotlin MP
+                """.trimIndent(),
+            actual = parsedString,
+        )
+
+        assertEquals(
+            expected = 1,
+            actual = state.richParagraphList.size,
+        )
+    }
+
 }