Merge pull request #1704 from jun-sheaf/master

Fixes ordered list ")" delimiter
markedjs · Jun 17, 2020 · bd4757f · bd4757f · vercel · Jun 17, 2020
2 parents 26cb01f + d8e1275
commit bd4757f
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 21 deletions.
diff --git a/lib/marked.esm.js b/lib/marked.esm.js
@@ -492,12 +492,13 @@ var Tokenizer_1 = class Tokenizer {
       let raw = cap[0];
       const bull = cap[2];
       const isordered = bull.length > 1;
+      const isparen = bull[bull.length - 1] === ')';
 
       const list = {
         type: 'list',
         raw,
         ordered: isordered,
-        start: isordered ? +bull : '',
+        start: isordered ? +bull.slice(0, -1) : '',
         loose: false,
         items: []
       };
@@ -522,7 +523,7 @@ var Tokenizer_1 = class Tokenizer {
         // Remove the list item's bullet
         // so it is seen as the next token.
         space = item.length;
-        item = item.replace(/^ *([*+-]|\d+\.) */, '');
+        item = item.replace(/^ *([*+-]|\d+[.)]) */, '');
 
         // Outdent whatever the
         // list item contains. Hacky.
@@ -537,7 +538,7 @@ var Tokenizer_1 = class Tokenizer {
         // Backpedal if it does not belong in this list.
         if (i !== l - 1) {
           b = this.rules.block.bullet.exec(itemMatch[i + 1])[0];
-          if (bull.length > 1 ? b.length === 1
+          if (isordered ? b.length === 1 || (!isparen && b[b.length - 1] === ')')
             : (b.length > 1 || (this.options.smartLists && b !== bull))) {
             addBack = itemMatch.slice(i + 1).join('\n');
             list.raw = list.raw.substring(0, list.raw.length - addBack.length);
@@ -974,7 +975,7 @@ block.def = edit$1(block.def)
   .replace('title', block._title)
   .getRegex();
 
-block.bullet = /(?:[*+-]|\d{1,9}\.)/;
+block.bullet = /(?:[*+-]|\d{1,9}[.)])/;
 block.item = /^( *)(bull) ?[^\n]*(?:\n(?!\1bull ?)[^\n]*)*/;
 block.item = edit$1(block.item, 'gm')
   .replace(/bull/g, block.bullet)

diff --git a/lib/marked.js b/lib/marked.js
@@ -585,11 +585,12 @@
         var raw = cap[0];
         var bull = cap[2];
         var isordered = bull.length > 1;
+        var isparen = bull[bull.length - 1] === ')';
         var list = {
           type: 'list',
           raw: raw,
           ordered: isordered,
-          start: isordered ? +bull : '',
+          start: isordered ? +bull.slice(0, -1) : '',
           loose: false,
           items: []
         }; // Get each top-level item.
@@ -611,7 +612,7 @@
           // so it is seen as the next token.
 
           space = item.length;
-          item = item.replace(/^ *([*+-]|\d+\.) */, ''); // Outdent whatever the
+          item = item.replace(/^ *([*+-]|\d+[.)]) */, ''); // Outdent whatever the
           // list item contains. Hacky.
 
           if (~item.indexOf('\n ')) {
@@ -624,7 +625,7 @@
           if (i !== l - 1) {
             b = this.rules.block.bullet.exec(itemMatch[i + 1])[0];
 
-            if (bull.length > 1 ? b.length === 1 : b.length > 1 || this.options.smartLists && b !== bull) {
+            if (isordered ? b.length === 1 || !isparen && b[b.length - 1] === ')' : b.length > 1 || this.options.smartLists && b !== bull) {
               addBack = itemMatch.slice(i + 1).join('\n');
               list.raw = list.raw.substring(0, list.raw.length - addBack.length);
               i = l - 1;
@@ -1076,7 +1077,7 @@
   block._label = /(?!\s*\])(?:\\[\[\]]|[^\[\]])+/;
   block._title = /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/;
   block.def = edit$1(block.def).replace('label', block._label).replace('title', block._title).getRegex();
-  block.bullet = /(?:[*+-]|\d{1,9}\.)/;
+  block.bullet = /(?:[*+-]|\d{1,9}[.)])/;
   block.item = /^( *)(bull) ?[^\n]*(?:\n(?!\1bull ?)[^\n]*)*/;
   block.item = edit$1(block.item, 'gm').replace(/bull/g, block.bullet).getRegex();
   block.list = edit$1(block.list).replace(/bull/g, block.bullet).replace('hr', '\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))').replace('def', '\\n+(?=' + block.def.source + ')').getRegex();

diff --git a/marked.min.js b/marked.min.js
diff --git a/src/Tokenizer.js b/src/Tokenizer.js
@@ -195,12 +195,13 @@ module.exports = class Tokenizer {
       let raw = cap[0];
       const bull = cap[2];
       const isordered = bull.length > 1;
+      const isparen = bull[bull.length - 1] === ')';
 
       const list = {
         type: 'list',
         raw,
         ordered: isordered,
-        start: isordered ? +bull : '',
+        start: isordered ? +bull.slice(0, -1) : '',
         loose: false,
         items: []
       };
@@ -225,7 +226,7 @@ module.exports = class Tokenizer {
         // Remove the list item's bullet
         // so it is seen as the next token.
         space = item.length;
-        item = item.replace(/^ *([*+-]|\d+\.) */, '');
+        item = item.replace(/^ *([*+-]|\d+[.)]) */, '');
 
         // Outdent whatever the
         // list item contains. Hacky.
@@ -240,7 +241,7 @@ module.exports = class Tokenizer {
         // Backpedal if it does not belong in this list.
         if (i !== l - 1) {
           b = this.rules.block.bullet.exec(itemMatch[i + 1])[0];
-          if (bull.length > 1 ? b.length === 1
+          if (isordered ? b.length === 1 || (!isparen && b[b.length - 1] === ')')
             : (b.length > 1 || (this.options.smartLists && b !== bull))) {
             addBack = itemMatch.slice(i + 1).join('\n');
             list.raw = list.raw.substring(0, list.raw.length - addBack.length);

diff --git a/src/rules.js b/src/rules.js
@@ -42,7 +42,7 @@ block.def = edit(block.def)
   .replace('title', block._title)
   .getRegex();
 
-block.bullet = /(?:[*+-]|\d{1,9}\.)/;
+block.bullet = /(?:[*+-]|\d{1,9}[.)])/;
 block.item = /^( *)(bull) ?[^\n]*(?:\n(?!\1bull ?)[^\n]*)*/;
 block.item = edit(block.item, 'gm')
   .replace(/bull/g, block.bullet)

diff --git a/test/specs/commonmark/commonmark.0.29.json b/test/specs/commonmark/commonmark.0.29.json
@@ -2146,8 +2146,7 @@
     "example": 266,
     "start_line": 4595,
     "end_line": 4606,
-    "section": "List items",
-    "shouldFail": true
+    "section": "List items"
   },
   {
     "markdown": "10) foo\n   - bar\n",
@@ -2197,8 +2196,7 @@
     "example": 272,
     "start_line": 4909,
     "end_line": 4921,
-    "section": "Lists",
-    "shouldFail": true
+    "section": "Lists"
   },
   {
     "markdown": "Foo\n- bar\n- baz\n",

diff --git a/test/specs/gfm/commonmark.0.29.json b/test/specs/gfm/commonmark.0.29.json
@@ -2146,8 +2146,7 @@
     "example": 266,
     "start_line": 4595,
     "end_line": 4606,
-    "section": "List items",
-    "shouldFail": true
+    "section": "List items"
   },
   {
     "markdown": "10) foo\n   - bar\n",
@@ -2197,8 +2196,7 @@
     "example": 272,
     "start_line": 4909,
     "end_line": 4921,
-    "section": "Lists",
-    "shouldFail": true
+    "section": "Lists"
   },
   {
     "markdown": "Foo\n- bar\n- baz\n",

diff --git a/test/specs/new/list_paren_delimiter.html b/test/specs/new/list_paren_delimiter.html
@@ -0,0 +1,11 @@
+<ol>
+ <li>one</li>
+ <li>two</li>
+ <li>three</li>
+</ol>
+
+<ol start="2">
+ <li>two</li>
+ <li>three</li>
+ <li>four</li>
+</ol>
diff --git a/test/specs/new/list_paren_delimiter.md b/test/specs/new/list_paren_delimiter.md
@@ -0,0 +1,8 @@
+1) one
+2) two
+3) three
+
+
+2) two
+3) three
+4) four
diff --git a/test/unit/Lexer-spec.js b/test/unit/Lexer-spec.js
@@ -365,6 +365,31 @@ a | b
       });
     });
 
+    it('ordered with parenthesis', () => {
+      expectTokens({
+        md: `
+1) item 1
+2) item 2
+`,
+        tokens: jasmine.arrayContaining([
+          jasmine.objectContaining({
+            type: 'list',
+            raw: '1) item 1\n2) item 2\n',
+            ordered: true,
+            start: 1,
+            items: [
+              jasmine.objectContaining({
+                raw: '1) item 1'
+              }),
+              jasmine.objectContaining({
+                raw: '2) item 2\n'
+              })
+            ]
+          })
+        ])
+      });
+    });
+
     it('start', () => {
       expectTokens({
         md: `