fix code after list

markedjs · Feb 10, 2021 · e3f53bd · e3f53bd
1 parent 2e9376d
commit e3f53bd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/Tokenizer.js b/src/Tokenizer.js
@@ -231,7 +231,7 @@ module.exports = class Tokenizer {
 
         if (!this.options.pedantic) {
           // Determine if current item contains the end of the list
-          endMatch = item.match(new RegExp(`\\n *\\n {0,${bcurr[0].length - 1}}\\S`));
+          endMatch = item.match(new RegExp('\\n *\\n {0,' + (bcurr[0].length - 1) + '}\\S'));
           if (endMatch) {
             // console.log(item, endMatch);
             let num = item.length - endMatch.index;
@@ -256,8 +256,8 @@ module.exports = class Tokenizer {
               ? bnext[1].length >= bcurr[0].length || bnext[1].length > 3
               : bnext[1].length > bcurr[1].length
           ) {
-            // nested list
-            itemMatch.splice(i, 2, itemMatch[i] + '\n' + itemMatch[i + 1]);
+            // nested list or continuation
+            itemMatch.splice(i, 2, itemMatch[i] + (!itemMatch[i].match(/\n$/) && !this.options.pedantic && bnext[1].length < bcurr[0].length ? '' : '\n') + itemMatch[i + 1]);
             i--;
             l--;
             continue;

diff --git a/test/specs/commonmark/commonmark.0.29.json b/test/specs/commonmark/commonmark.0.29.json
@@ -2270,8 +2270,7 @@
     "example": 282,
     "start_line": 5177,
     "end_line": 5191,
-    "section": "Lists",
-    "shouldFail": true
+    "section": "Lists"
   },
   {
     "markdown": "1. a\n\n  2. b\n\n    3. c\n",

diff --git a/test/specs/gfm/commonmark.0.29.json b/test/specs/gfm/commonmark.0.29.json
@@ -2270,8 +2270,7 @@
     "example": 282,
     "start_line": 5177,
     "end_line": 5191,
-    "section": "Lists",
-    "shouldFail": true
+    "section": "Lists"
   },
   {
     "markdown": "1. a\n\n  2. b\n\n    3. c\n",