Merge pull request #379 from MohamedRejeb/1.x

Fix spaces around span style break formatting in resulting markdown
MohamedRejeb · Oct 1, 2024 · 66b9a45 · 66b9a45
2 parents 69fa04d + d60ba92
commit 66b9a45
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 4 deletions.
diff --git a/...monMain/kotlin/com/mohamedrejeb/richeditor/parser/markdown/RichTextStateMarkdownParser.kt b/...monMain/kotlin/com/mohamedrejeb/richeditor/parser/markdown/RichTextStateMarkdownParser.kt
@@ -329,7 +329,7 @@ internal object RichTextStateMarkdownParser : RichTextStateParser<String> {
             }
         }
 
-        return builder.toString()
+        return correctMarkdownText(builder.toString())
     }
 
     @OptIn(ExperimentalRichTextApi::class)
@@ -339,6 +339,9 @@ internal object RichTextStateMarkdownParser : RichTextStateParser<String> {
         // Check if span is empty
         if (richSpan.isEmpty()) return ""
 
+        // Check if span is blank
+        val isBlank = richSpan.isBlank()
+
         // Convert span style to CSS string
         val markdownOpen = mutableListOf<String>()
         val markdownClose = mutableListOf<String>()
@@ -364,7 +367,8 @@ internal object RichTextStateMarkdownParser : RichTextStateParser<String> {
         }
 
         // Append markdown open
-        stringBuilder.append(markdownOpen.joinToString(separator = ""))
+        if (!isBlank)
+            stringBuilder.append(markdownOpen.joinToString(separator = ""))
 
         // Apply rich span style to markdown
         val spanMarkdown = decodeMarkdownElementFromRichSpan(richSpan.text, richSpan.richSpanStyle)
@@ -378,7 +382,8 @@ internal object RichTextStateMarkdownParser : RichTextStateParser<String> {
         }
 
         // Append markdown close
-        stringBuilder.append(markdownClose.reversed().joinToString(separator = ""))
+        if (!isBlank)
+            stringBuilder.append(markdownClose.reversed().joinToString(separator = ""))
 
         return stringBuilder.toString()
     }
@@ -468,7 +473,7 @@ internal object RichTextStateMarkdownParser : RichTextStateParser<String> {
     }
 
     /**
-     * Decodes HTML elements from [RichSpan].
+     * Decodes Markdown elements from [RichSpan].
      */
     @OptIn(ExperimentalRichTextApi::class)
     private fun decodeMarkdownElementFromRichSpan(

diff --git a/...tlin/com.mohamedrejeb.richeditor/parser/markdown/RichTextStateMarkdownParserDecodeTest.kt b/...tlin/com.mohamedrejeb.richeditor/parser/markdown/RichTextStateMarkdownParserDecodeTest.kt
@@ -13,6 +13,7 @@ import com.mohamedrejeb.richeditor.paragraph.RichParagraph
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
+@ExperimentalRichTextApi
 class RichTextStateMarkdownParserDecodeTest {
 
     /**
@@ -174,4 +175,64 @@ class RichTextStateMarkdownParserDecodeTest {
         )
     }
 
+    @Test
+    fun testDecodeStyledTextWithSpacesInStyleEdges1() {
+        val state = RichTextState(
+            initialRichParagraphList = listOf(
+                RichParagraph().also {
+                    it.children.add(
+                        RichSpan(
+                            text = "  Hello  ",
+                            paragraph = it,
+                            spanStyle = SpanStyle(fontWeight = FontWeight.Bold)
+                        ),
+                    )
+
+                    it.children.add(
+                        RichSpan(
+                            text = "World!",
+                            paragraph = it,
+                        ),
+                    )
+                },
+            )
+        )
+
+        assertEquals(
+            expected = "  **Hello**  World!",
+            actual = state.toMarkdown()
+        )
+    }
+
+    @Test
+    fun testDecodeStyledTextWithSpacesInStyleEdges2() {
+        val state = RichTextState(
+            initialRichParagraphList = listOf(
+                RichParagraph().also {
+                    it.children.add(
+                        RichSpan(
+                            text = "  Hello  ",
+                            paragraph = it,
+                            spanStyle = SpanStyle(fontWeight = FontWeight.Bold)
+                        ).also {
+                            it.children.add(
+                                RichSpan(
+                                    text = "  World!  ",
+                                    paragraph = it.paragraph,
+                                    parent = it,
+                                    spanStyle = SpanStyle(fontStyle = FontStyle.Italic)
+                                ),
+                            )
+                        },
+                    )
+                },
+            )
+        )
+
+        assertEquals(
+            expected = "  **Hello    *World!***  ",
+            actual = state.toMarkdown()
+        )
+    }
+
 }