Fix to merge blockquotes in gfm mode

Closes GH-417. Reviewed-by: Christian Murphy <[email protected]> Reviewed-by: Marouane Fazouane <[email protected]> Reviewed-by: Titus Wormer <[email protected]>
remarkjs · Jul 10, 2019 · 2f0edce · 2f0edce
1 parent 927083c
commit 2f0edce
Show file tree

Hide file tree

Showing 7 changed files with 508 additions and 112 deletions.
diff --git a/packages/remark-parse/lib/tokenizer.js b/packages/remark-parse/lib/tokenizer.js
@@ -302,9 +302,9 @@ function mergeText(prev, node) {
   return prev
 }
 
-// Merge two blockquotes: `node` into `prev`, unless in CommonMark mode.
+// Merge two blockquotes: `node` into `prev`, unless in CommonMark or gfm modes.
 function mergeBlockquote(prev, node) {
-  if (this.options.commonmark) {
+  if (this.options.commonmark || this.options.gfm) {
     return node
   }
 

diff --git a/test/fixtures/input/blockquotes.text b/test/fixtures/input/blockquotes.text
@@ -1,3 +1,3 @@
 > This is a blockquote.
 
-> This is, in commonmark mode, another blockquote.
+> This is, in commonmark mode and gfm mode, another blockquote.
diff --git a/test/fixtures/tree/blockquotes.commonmark.json b/test/fixtures/tree/blockquotes.commonmark.json
@@ -62,7 +62,7 @@
           "children": [
             {
               "type": "text",
-              "value": "This is, in commonmark mode, another blockquote.",
+              "value": "This is, in commonmark mode and gfm mode, another blockquote.",
               "position": {
                 "start": {
                   "line": 3,
@@ -71,8 +71,8 @@
                 },
                 "end": {
                   "line": 3,
-                  "column": 51,
-                  "offset": 75
+                  "column": 64,
+                  "offset": 88
                 },
                 "indent": []
               }
@@ -86,8 +86,8 @@
             },
             "end": {
               "line": 3,
-              "column": 51,
-              "offset": 75
+              "column": 64,
+              "offset": 88
             },
             "indent": []
           }
@@ -101,8 +101,8 @@
         },
         "end": {
           "line": 3,
-          "column": 51,
-          "offset": 75
+          "column": 64,
+          "offset": 88
         },
         "indent": []
       }
@@ -117,7 +117,7 @@
     "end": {
       "line": 4,
       "column": 1,
-      "offset": 76
+      "offset": 89
     }
   }
 }
diff --git a/test/fixtures/tree/blockquotes.json b/test/fixtures/tree/blockquotes.json
@@ -38,13 +38,31 @@
             },
             "indent": []
           }
+        }
+      ],
+      "position": {
+        "start": {
+          "line": 1,
+          "column": 1,
+          "offset": 0
+        },
+        "end": {
+          "line": 1,
+          "column": 24,
+          "offset": 23
         },
+        "indent": []
+      }
+    },
+    {
+      "type": "blockquote",
+      "children": [
         {
           "type": "paragraph",
           "children": [
             {
               "type": "text",
-              "value": "This is, in commonmark mode, another blockquote.",
+              "value": "This is, in commonmark mode and gfm mode, another blockquote.",
               "position": {
                 "start": {
                   "line": 3,
@@ -53,8 +71,8 @@
                 },
                 "end": {
                   "line": 3,
-                  "column": 51,
-                  "offset": 75
+                  "column": 64,
+                  "offset": 88
                 },
                 "indent": []
               }
@@ -68,28 +86,25 @@
             },
             "end": {
               "line": 3,
-              "column": 51,
-              "offset": 75
+              "column": 64,
+              "offset": 88
             },
             "indent": []
           }
         }
       ],
       "position": {
         "start": {
-          "line": 1,
+          "line": 3,
           "column": 1,
-          "offset": 0
+          "offset": 25
         },
         "end": {
           "line": 3,
-          "column": 51,
-          "offset": 75
+          "column": 64,
+          "offset": 88
         },
-        "indent": [
-          1,
-          1
-        ]
+        "indent": []
       }
     }
   ],
@@ -102,7 +117,7 @@
     "end": {
       "line": 4,
       "column": 1,
-      "offset": 76
+      "offset": 89
     }
   }
 }