Merge pull request #1617 from UziTech/following-nptable

break nptables on block-level structures
markedjs · Mar 17, 2020 · 8d51037 · 8d51037 · vercel · Mar 17, 2020
2 parents c71ac10 + 2d8045f
commit 8d51037
Show file tree

Hide file tree

Showing 28 changed files with 448 additions and 5 deletions.
diff --git a/src/rules.js b/src/rules.js
@@ -93,22 +93,34 @@ block.normal = merge({}, block);
  */
 
 block.gfm = merge({}, block.normal, {
-  nptable: /^ *([^|\n ].*\|.*)\n *([-:]+ *\|[-| :]*)(?:\n((?:.*[^>\n ].*(?:\n|$))*)\n*|$)/,
+  nptable: '^ *([^|\\n ].*\\|.*)\\n' // Header
+    + ' *([-:]+ *\\|[-| :]*)' // Align
+    + '(?:\\n((?:(?!\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)', // Cells
   table: '^ *\\|(.+)\\n' // Header
     + ' *\\|?( *[-:]+[-| :]*)' // Align
-    + '(?:\\n((?:(?!^|>|\\n| |hr|heading|lheading|code|fences|list|html).*(?:\\n|$))*)\\n*|$)' // Cells
+    + '(?:\\n *((?:(?!\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)' // Cells
 });
 
+block.gfm.nptable = edit(block.gfm.nptable)
+  .replace('hr', block.hr)
+  .replace('heading', ' {0,3}#{1,6} ')
+  .replace('blockquote', ' {0,3}>')
+  .replace('code', ' {4}[^\\n]')
+  .replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
+  .replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
+  .replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|!--)')
+  .replace('tag', block._tag) // tables can be interrupted by type (6) html blocks
+  .getRegex();
+
 block.gfm.table = edit(block.gfm.table)
   .replace('hr', block.hr)
   .replace('heading', ' {0,3}#{1,6} ')
-  .replace('lheading', '([^\\n]+)\\n {0,3}(=+|-+) *(?:\\n+|$)')
   .replace('blockquote', ' {0,3}>')
   .replace('code', ' {4}[^\\n]')
   .replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
   .replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
   .replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|!--)')
-  .replace('tag', block._tag) // pars can be interrupted by type (6) html blocks
+  .replace('tag', block._tag) // tables can be interrupted by type (6) html blocks
   .getRegex();
 
 /**

diff --git a/test/specs/new/blockquote_following_nptable.html b/test/specs/new/blockquote_following_nptable.html
@@ -0,0 +1,38 @@
+<table>
+  <thead>
+    <tr>
+      <th>abc</th>
+      <th>def</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>bar</td>
+      <td>foo</td>
+    </tr>
+    <tr>
+      <td>baz</td>
+      <td>boo</td>
+    </tr>
+  </tbody>
+</table>
+<blockquote><p>a blockquote</p></blockquote>
+<table>
+  <thead>
+    <tr>
+      <th>abc</th>
+      <th>def</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>bar</td>
+      <td>foo</td>
+    </tr>
+    <tr>
+      <td>baz</td>
+      <td>boo</td>
+    </tr>
+  </tbody>
+</table>
+<blockquote><p>a blockquote</p></blockquote>
diff --git a/test/specs/new/blockquote_following_nptable.md b/test/specs/new/blockquote_following_nptable.md
@@ -0,0 +1,11 @@
+ abc | def
+ --- | ---
+ bar | foo
+ baz | boo
+> a blockquote
+
+ abc | def
+ --- | ---
+ bar | foo
+ baz | boo
+   > a blockquote
diff --git a/test/specs/new/blockquote_following_table.html b/test/specs/new/blockquote_following_table.html
@@ -0,0 +1,38 @@
+<table>
+  <thead>
+    <tr>
+      <th>abc</th>
+      <th>def</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>bar</td>
+      <td>foo</td>
+    </tr>
+    <tr>
+      <td>baz</td>
+      <td>boo</td>
+    </tr>
+  </tbody>
+</table>
+<blockquote><p>a blockquote</p></blockquote>
+<table>
+  <thead>
+    <tr>
+      <th>abc</th>
+      <th>def</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>bar</td>
+      <td>foo</td>
+    </tr>
+    <tr>
+      <td>baz</td>
+      <td>boo</td>
+    </tr>
+  </tbody>
+</table>
+<blockquote><p>a blockquote</p></blockquote>
diff --git a/test/specs/new/blockquote_following_table.md b/test/specs/new/blockquote_following_table.md
@@ -0,0 +1,11 @@
+| abc | def |
+| --- | --- |
+| bar | foo |
+| baz | boo |
+> a blockquote
+
+| abc | def |
+| --- | --- |
+| bar | foo |
+| baz | boo |
+   > a blockquote
diff --git a/test/specs/new/code_following_nptable.html b/test/specs/new/code_following_nptable.html
@@ -0,0 +1,43 @@
+<table>
+  <thead>
+    <tr>
+      <th>abc</th>
+      <th>def</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>bar</td>
+      <td>foo</td>
+    </tr>
+    <tr>
+      <td>baz</td>
+      <td>boo</td>
+    </tr>
+  </tbody>
+</table>
+<pre><code>a simple
+ *indented* code block
+</code></pre>
+
+<table>
+  <thead>
+    <tr>
+      <th>abc</th>
+      <th>def</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>bar</td>
+      <td>foo</td>
+    </tr>
+    <tr>
+      <td>baz</td>
+      <td>boo</td>
+    </tr>
+  </tbody>
+</table>
+<pre><code>a simple
+ *indented* code block
+</code></pre>
diff --git a/test/specs/new/code_following_nptable.md b/test/specs/new/code_following_nptable.md
@@ -0,0 +1,13 @@
+abc | def
+--- | ---
+bar | foo
+baz | boo
+    a simple
+      *indented* code block
+
+   abc | def
+   --- | ---
+   bar | foo
+   baz | boo
+    a simple
+      *indented* code block
diff --git a/test/specs/new/code_following_table.html b/test/specs/new/code_following_table.html
@@ -19,3 +19,25 @@
 <pre><code>a simple
  *indented* code block
 </code></pre>
+
+<table>
+  <thead>
+    <tr>
+      <th>abc</th>
+      <th>def</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>bar</td>
+      <td>foo</td>
+    </tr>
+    <tr>
+      <td>baz</td>
+      <td>boo</td>
+    </tr>
+  </tbody>
+</table>
+<pre><code>a simple
+ *indented* code block
+</code></pre>
diff --git a/test/specs/new/code_following_table.md b/test/specs/new/code_following_table.md
@@ -4,3 +4,10 @@
 | baz | boo |
     a simple
       *indented* code block
+
+   | abc | def |
+   | --- | --- |
+   | bar | foo |
+   | baz | boo |
+    a simple
+      *indented* code block
diff --git a/test/specs/new/fences_following_nptable.html b/test/specs/new/fences_following_nptable.html
@@ -0,0 +1,19 @@
+<table>
+  <thead>
+    <tr>
+      <th>abc</th>
+      <th>def</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>bar</td>
+      <td>foo</td>
+    </tr>
+    <tr>
+      <td>baz</td>
+      <td>boo</td>
+    </tr>
+  </tbody>
+</table>
+<pre><code>foobar()</code></pre>
diff --git a/test/specs/new/fences_following_nptable.md b/test/specs/new/fences_following_nptable.md
@@ -0,0 +1,7 @@
+ abc | def
+ --- | ---
+ bar | foo
+ baz | boo
+```
+foobar()
+```
diff --git a/test/specs/new/heading_following_nptable.html b/test/specs/new/heading_following_nptable.html
@@ -0,0 +1,19 @@
+<table>
+  <thead>
+    <tr>
+      <th>abc</th>
+      <th>def</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>bar</td>
+      <td>foo</td>
+    </tr>
+    <tr>
+      <td>baz</td>
+      <td>boo</td>
+    </tr>
+  </tbody>
+</table>
+<h1 id="title">title</h1>
diff --git a/test/specs/new/heading_following_nptable.md b/test/specs/new/heading_following_nptable.md
@@ -0,0 +1,5 @@
+ abc | def
+ --- | ---
+ bar | foo
+ baz | boo
+# title
diff --git a/test/specs/new/hr_following_nptables.html b/test/specs/new/hr_following_nptables.html
@@ -0,0 +1,19 @@
+<table>
+  <thead>
+    <tr>
+      <th>abc</th>
+      <th>def</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>bar</td>
+      <td>foo</td>
+    </tr>
+    <tr>
+      <td>baz</td>
+      <td>boo</td>
+    </tr>
+  </tbody>
+</table>
+<hr>
diff --git a/test/specs/new/hr_following_nptables.md b/test/specs/new/hr_following_nptables.md
@@ -0,0 +1,5 @@
+ abc | def
+ --- | ---
+ bar | foo
+ baz | boo
+___
diff --git a/test/specs/new/html_following_nptable.html b/test/specs/new/html_following_nptable.html
@@ -0,0 +1,19 @@
+<table>
+  <thead>
+    <tr>
+      <th>abc</th>
+      <th>def</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>bar</td>
+      <td>foo</td>
+    </tr>
+    <tr>
+      <td>baz</td>
+      <td>boo</td>
+    </tr>
+  </tbody>
+</table>
+<div>Some HTML</div>
diff --git a/test/specs/new/html_following_nptable.md b/test/specs/new/html_following_nptable.md
@@ -0,0 +1,5 @@
+ abc | def
+ --- | ---
+ bar | foo
+ baz | boo
+<div>Some HTML</div>
diff --git a/test/specs/new/inlinecode_following_nptables.html b/test/specs/new/inlinecode_following_nptables.html
@@ -0,0 +1,22 @@
+<table>
+  <thead>
+    <tr>
+      <th>abc</th>
+      <th>def</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>bar</td>
+      <td>foo</td>
+    </tr>
+    <tr>
+      <td>baz</td>
+      <td>boo</td>
+    </tr>
+    <tr>
+      <td><code>hello</code></td>
+      <td></td>
+    </tr>
+  </tbody>
+</table>
diff --git a/test/specs/new/inlinecode_following_nptables.md b/test/specs/new/inlinecode_following_nptables.md
@@ -0,0 +1,5 @@
+ abc | def
+ --- | ---
+ bar | foo
+ baz | boo
+`hello`
diff --git a/test/specs/new/lheading_following_nptable.html b/test/specs/new/lheading_following_nptable.html
@@ -0,0 +1,26 @@
+<table>
+  <thead>
+    <tr>
+      <th>abc</th>
+      <th>def</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>bar</td>
+      <td>foo</td>
+    </tr>
+    <tr>
+      <td>baz</td>
+      <td>boo</td>
+    </tr>
+    <tr>
+      <td>title</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>=====</td>
+      <td></td>
+    </tr>
+  </tbody>
+</table>