fix(tables): tables are properly rendered when followed by a single linebreak and a list

Closes #443

dist/showdown.js

@@ -1,4 +1,4 @@
-;/*! showdown v 1.7.5 - 02-10-2017 */
+;/*! showdown v 1.7.5 - 06-10-2017 */
 (function(){
 /**
  * Created by Tivie on 13-07-2015.
@@ -2843,9 +2843,9 @@ showdown.subParser('tables', function (text, options, globals) {
     return text;
   }
 
-  var tableRgx       = /^ {0,3}\|?.+\|.+\n {0,3}\|?[ \t]*:?[ \t]*(?:[-=]){2,}[ \t]*:?[ \t]*\|[ \t]*:?[ \t]*(?:[-=]){2,}[\s\S]+?(?:\n\n|¨0)/gm,
+  var tableRgx       = /^ {0,3}\|?.+\|.+\n {0,3}\|?[ \t]*:?[ \t]*(?:[-=]){2,}[ \t]*:?[ \t]*\|[ \t]*:?[ \t]*(?:[-=]){2,}[\s\S]+?(?:\n\n|<ol|<ul|¨0)/gm,
     //singeColTblRgx = /^ {0,3}\|.+\|\n {0,3}\|[ \t]*:?[ \t]*(?:[-=]){2,}[ \t]*:?[ \t]*\|[ \t]*\n(?: {0,3}\|.+\|\n)+(?:\n\n|¨0)/gm;
-      singeColTblRgx = /^ {0,3}\|.+\|\n {0,3}\|[ \t]*:?[ \t]*(?:[-=]){2,}[ \t]*:?[ \t]*\|\n( {0,3}\|.+\|\n)*(?:\n|¨0)/gm;
+      singeColTblRgx = /^ {0,3}\|.+\|\n {0,3}\|[ \t]*:?[ \t]*(?:[-=]){2,}[ \t]*:?[ \t]*\|\n( {0,3}\|.+\|\n)*(?:\n|<ol|<ul|¨0)/gm;
 
   function parseStyles (sLine) {
     if (/^:[ \t]*--*$/.test(sLine)) {
@@ -2961,11 +2961,24 @@ showdown.subParser('tables', function (text, options, globals) {
     return buildTable(headers, cells);
   }
 
+  function hackFixTableFollowedByList (rawTable) {
+    var lastChars = rawTable.slice(-3);
+    if (lastChars === '<ol' || lastChars === '<ul') {
+      rawTable = rawTable.slice(0, -3) + '\n\n' + rawTable.slice(-3);
+    }
+    return rawTable;
+  }
+
   text = globals.converter._dispatch('tables.before', text, options, globals);
 
   // find escaped pipe characters
   text = text.replace(/\\(\|)/g, showdown.helper.escapeCharactersCallback);
 
+  // hackfix issue #443. Due to lists only having a linebreak before them, we need to manually insert a linebreak to prevent
+  // tables not being parsed when followed by a list
+  text = text.replace(tableRgx, hackFixTableFollowedByList);
+  text = text.replace(singeColTblRgx, hackFixTableFollowedByList);
+
   // parse multi column tables
   text = text.replace(tableRgx, parseTable);
 

src/subParsers/tables.js

@@ -5,9 +5,9 @@ showdown.subParser('tables', function (text, options, globals) {
     return text;
   }
 
-  var tableRgx       = /^ {0,3}\|?.+\|.+\n {0,3}\|?[ \t]*:?[ \t]*(?:[-=]){2,}[ \t]*:?[ \t]*\|[ \t]*:?[ \t]*(?:[-=]){2,}[\s\S]+?(?:\n\n|¨0)/gm,
+  var tableRgx       = /^ {0,3}\|?.+\|.+\n {0,3}\|?[ \t]*:?[ \t]*(?:[-=]){2,}[ \t]*:?[ \t]*\|[ \t]*:?[ \t]*(?:[-=]){2,}[\s\S]+?(?:\n\n|<ol|<ul|¨0)/gm,
     //singeColTblRgx = /^ {0,3}\|.+\|\n {0,3}\|[ \t]*:?[ \t]*(?:[-=]){2,}[ \t]*:?[ \t]*\|[ \t]*\n(?: {0,3}\|.+\|\n)+(?:\n\n|¨0)/gm;
-      singeColTblRgx = /^ {0,3}\|.+\|\n {0,3}\|[ \t]*:?[ \t]*(?:[-=]){2,}[ \t]*:?[ \t]*\|\n( {0,3}\|.+\|\n)*(?:\n|¨0)/gm;
+      singeColTblRgx = /^ {0,3}\|.+\|\n {0,3}\|[ \t]*:?[ \t]*(?:[-=]){2,}[ \t]*:?[ \t]*\|\n( {0,3}\|.+\|\n)*(?:\n|<ol|<ul|¨0)/gm;
 
   function parseStyles (sLine) {
     if (/^:[ \t]*--*$/.test(sLine)) {
@@ -123,11 +123,24 @@ showdown.subParser('tables', function (text, options, globals) {
     return buildTable(headers, cells);
   }
 
+  function hackFixTableFollowedByList (rawTable) {
+    var lastChars = rawTable.slice(-3);
+    if (lastChars === '<ol' || lastChars === '<ul') {
+      rawTable = rawTable.slice(0, -3) + '\n\n' + rawTable.slice(-3);
+    }
+    return rawTable;
+  }
+
   text = globals.converter._dispatch('tables.before', text, options, globals);
 
   // find escaped pipe characters
   text = text.replace(/\\(\|)/g, showdown.helper.escapeCharactersCallback);
 
+  // hackfix issue #443. Due to lists only having a linebreak before them, we need to manually insert a linebreak to prevent
+  // tables not being parsed when followed by a list
+  text = text.replace(tableRgx, hackFixTableFollowedByList);
+  text = text.replace(singeColTblRgx, hackFixTableFollowedByList);
+
   // parse multi column tables
   text = text.replace(tableRgx, parseTable);
 

test/features/tables/#443.2.table-followed-by-list-does-not-parse-correctly.html

@@ -0,0 +1,21 @@
+<table>
+    <thead>
+    <tr>
+        <th>Tables</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td><strong>col 3 is</strong></td>
+    </tr>
+    <tr>
+        <td>col 2 is</td>
+    </tr>
+    <tr>
+        <td>zebra stripes</td>
+    </tr>
+    </tbody>
+</table>
+<ol>
+    <li>test</li>
+</ol>

test/features/tables/#443.2.table-followed-by-list-does-not-parse-correctly.md

@@ -0,0 +1,7 @@
+| Tables        |
+| ------------- |
+| **col 3 is**  |
+| col 2 is      |
+| zebra stripes |
+
+1. test

test/features/tables/#443.table-followed-by-list-does-not-parse-correctly.html

@@ -0,0 +1,29 @@
+<table>
+<thead>
+<tr>
+    <th>Tables</th>
+    <th style="text-align:center;">Are</th>
+    <th style="text-align:right;">Cool</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+    <td><strong>col 3 is</strong></td>
+    <td style="text-align:center;">right-aligned</td>
+    <td style="text-align:right;">$1600</td>
+</tr>
+<tr>
+    <td>col 2 is</td>
+    <td style="text-align:center;"><em>centered</em></td>
+    <td style="text-align:right;">$12</td>
+</tr>
+<tr>
+    <td>zebra stripes</td>
+    <td style="text-align:center;">are neat</td>
+    <td style="text-align:right;">$1</td>
+</tr>
+</tbody>
+</table>
+<ol>
+    <li>test</li>
+</ol>

test/features/tables/#443.table-followed-by-list-does-not-parse-correctly.md

@@ -0,0 +1,7 @@
+| Tables        | Are           | Cool  |
+| ------------- |:-------------:| -----:|
+| **col 3 is**  | right-aligned | $1600 |
+| col 2 is      | *centered*    |   $12 |
+| zebra stripes | are neat      |    $1 |
+
+1. test