Merge pull request #61 from brson/nested-tables

Fix parsing of tables nested in other block elements
kivikakk · Apr 30, 2018 · 4b2d20d · 4b2d20d
2 parents 7151c60 + b05c6d7
commit 4b2d20d
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 1 deletion.
diff --git a/src/parser/table.rs b/src/parser/table.rs
@@ -88,7 +88,7 @@ fn try_opening_row<'a, 'o>(
     if parser.blank {
         return None;
     }
-    let this_row = row(line).unwrap();
+    let this_row = row(&line[parser.first_nonspace..]).unwrap();
     let new_row = parser.add_child(
         container,
         NodeValue::TableRow(false),

diff --git a/src/tests.rs b/src/tests.rs
@@ -706,3 +706,94 @@ fn smart_chars() {
         |opts| opts.smart = true,
     );
 }
+
+#[test]
+fn nested_tables_1() {
+    html_opts(
+        concat!(
+            "- p\n",
+            "\n",
+            "    |a|b|\n",
+            "    |-|-|\n",
+            "    |c|d|\n",
+        ),
+        concat!(
+            "<ul>\n",
+            "<li>\n",
+            "<p>p</p>\n",
+            "<table>\n",
+            "<thead>\n",
+            "<tr>\n",
+            "<th>a</th>\n",
+            "<th>b</th>\n",
+            "</tr>\n",
+            "</thead>\n",
+            "<tbody>\n",
+            "<tr>\n",
+            "<td>c</td>\n",
+            "<td>d</td>\n",
+            "</tr></tbody></table>\n",
+            "</li>\n",
+            "</ul>\n",
+        ),
+        |opts| opts.ext_table = true,
+    );
+}
+
+#[test]
+fn nested_tables_2() {
+    html_opts(
+        concat!(
+            "- |a|b|\n",
+            "  |-|-|\n",
+            "  |c|d|\n",
+        ),
+        concat!(
+            "<ul>\n",
+            "<li>\n",
+            "<table>\n",
+            "<thead>\n",
+            "<tr>\n",
+            "<th>a</th>\n",
+            "<th>b</th>\n",
+            "</tr>\n",
+            "</thead>\n",
+            "<tbody>\n",
+            "<tr>\n",
+            "<td>c</td>\n",
+            "<td>d</td>\n",
+            "</tr></tbody></table>\n",
+            "</li>\n",
+            "</ul>\n",
+        ),
+        |opts| opts.ext_table = true,
+    );
+}
+
+#[test]
+fn nested_tables_3() {
+    html_opts(
+        concat!(
+            "> |a|b|\n",
+            "> |-|-|\n",
+            "> |c|d|\n",
+        ),
+        concat!(
+            "<blockquote>\n",
+            "<table>\n",
+            "<thead>\n",
+            "<tr>\n",
+            "<th>a</th>\n",
+            "<th>b</th>\n",
+            "</tr>\n",
+            "</thead>\n",
+            "<tbody>\n",
+            "<tr>\n",
+            "<td>c</td>\n",
+            "<td>d</td>\n",
+            "</tr></tbody></table>\n",
+            "</blockquote>\n",
+        ),
+        |opts| opts.ext_table = true,
+    );
+}