Fix table parsing ignoring empty cells

iamgio · Jul 30, 2024 · df60408 · df60408
1 parent 2b62071
commit df60408
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 2 deletions.
diff --git a/core/src/main/kotlin/eu/iamgio/quarkdown/parser/BlockTokenParser.kt b/core/src/main/kotlin/eu/iamgio/quarkdown/parser/BlockTokenParser.kt
@@ -274,7 +274,7 @@ class BlockTokenParser(private val context: MutableContext) : BlockTokenVisitor<
          */
         fun splitRow(row: String): Sequence<String> =
             row.split("(?<!\\\\)\\|".toRegex()).asSequence()
-                .filterNot { it.isBlank() }
+                .filter { it.isNotEmpty() }
                 .map { it.trim() }
 
         /**

diff --git a/core/src/test/kotlin/eu/iamgio/quarkdown/BlockParserTest.kt b/core/src/test/kotlin/eu/iamgio/quarkdown/BlockParserTest.kt
@@ -16,6 +16,7 @@ import eu.iamgio.quarkdown.ast.Node
 import eu.iamgio.quarkdown.ast.OrderedList
 import eu.iamgio.quarkdown.ast.PageBreak
 import eu.iamgio.quarkdown.ast.Paragraph
+import eu.iamgio.quarkdown.ast.Strong
 import eu.iamgio.quarkdown.ast.Table
 import eu.iamgio.quarkdown.ast.TaskListItem
 import eu.iamgio.quarkdown.ast.Text
@@ -366,6 +367,32 @@ class BlockParserTest {
             assertFalse(hasNext())
         }
 
+        with(nodes.next().columns.iterator()) {
+            with(next()) {
+                assertEquals(Table.Alignment.LEFT, alignment)
+                assertTrue(header.text.isEmpty())
+                assertEquals(2, cells.size)
+                assertEquals(Strong(listOf(Text("C"))), cells[0].text.first())
+                assertEquals(Strong(listOf(Text("D"))), cells[1].text.first())
+            }
+            with(next()) {
+                assertEquals(Table.Alignment.NONE, alignment)
+                assertEquals(Text("A"), header.text.first())
+                assertEquals(2, cells.size)
+                assertEquals(Text("AC"), cells[0].text.first())
+                assertEquals(Text("AD"), cells[1].text.first())
+            }
+            with(next()) {
+                assertEquals(Table.Alignment.RIGHT, alignment)
+                assertEquals(Text("B"), header.text.first())
+                assertEquals(2, cells.size)
+                assertEquals(Text("BC"), cells[0].text.first())
+                assertEquals(Text("BD"), cells[1].text.first())
+            }
+
+            assertFalse(hasNext())
+        }
+
         assertFalse(nodes.hasNext())
     }
 

diff --git a/core/src/test/resources/parsing/table.md b/core/src/test/resources/parsing/table.md
@@ -15,4 +15,9 @@ bar | baz
 | abc | def |
 | --- |:----|
 | bar |
-| bar | baz | boo |
+| bar | baz | boo |
+
+|       | A  |  B |
+|:------|----|---:|
+| **C** | AC | BC |
+| **D** | AD | BD |