Fix markedjs#2314

calculuschild · Dec 9, 2021 · 08b74d5 · 08b74d5
1 parent e709bd7
commit 08b74d5
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/src/Tokenizer.js b/src/Tokenizer.js
@@ -169,7 +169,7 @@ export class Tokenizer {
     let cap = this.rules.block.list.exec(src);
     if (cap) {
       let raw, istask, ischecked, indent, i, blankLine, endsWithBlankLine,
-        line, nextLine, rawLine, itemContents;
+        line, nextLine, rawLine, itemContents, endEarly;
 
       let bull = cap[1].trim();
       const isordered = bull.length > 1;
@@ -194,6 +194,7 @@ export class Tokenizer {
 
       // Check if current bullet point can start a new List Item
       while (src) {
+        endEarly = false;
         if (!(cap = itemRegex.exec(src))) {
           break;
         }
@@ -223,13 +224,13 @@ export class Tokenizer {
         if (!line && /^ *$/.test(nextLine)) { // Items begin with at most one blank line
           raw += nextLine + '\n';
           src = src.substring(nextLine.length + 1);
-          list.loose = true;
+          endEarly = true;
         }
 
         const nextBulletRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:[*+-]|\\d{1,9}[.)])`);
 
         // Check if following lines should be included in List Item
-        while (src && !list.loose) {
+        while (src && !endEarly) {
           rawLine = src.split('\n', 1)[0];
           line = rawLine;
 

diff --git a/test/specs/new/multiple_sub_lists.html b/test/specs/new/multiple_sub_lists.html
@@ -0,0 +1,26 @@
+<ol>
+<li><p>list item one</p>
+<ol>
+<li>sublist item one</li>
+<li>sublist item two</li>
+</ol>
+</li>
+<li><p>list item two</p>
+<ol>
+<li>sublist item one</li>
+<li>sublist item two</li>
+</ol>
+</li>
+<li><p>list item three</p>
+<ol>
+<li>sublist item one</li>
+<li>sublist item two</li>
+</ol>
+</li>
+<li><p>list item four</p>
+<ol>
+<li>sublist item one</li>
+<li>sublist item two</li>
+</ol>
+</li>
+</ol>
diff --git a/test/specs/new/multiple_sub_lists.md b/test/specs/new/multiple_sub_lists.md
@@ -0,0 +1,15 @@
+1. list item one
+    1. sublist item one
+    2. sublist item two
+
+2. list item two
+    1. sublist item one
+    2. sublist item two
+
+3. list item three
+    1. sublist item one
+    2. sublist item two
+
+4. list item four
+    1. sublist item one
+    2. sublist item two