Fix footnote definitions without spacing

Previously, in the below example, the second definition was parsed as a normal definition instead of a footnote definition: ```md foo[^abc] bar. foo[^xyz] bar [^abc]: Baz baz [^xyz]: Baz ``` Now, both are seen as footnote definitions. Closes GH-106.
remarkjs · Dec 18, 2015 · 18195f6 · 18195f6
1 parent d8d4783
commit 18195f6
Show file tree

Hide file tree

Showing 7 changed files with 479 additions and 190 deletions.
diff --git a/lib/parse.js b/lib/parse.js
@@ -5899,8 +5899,8 @@ Parser.prototype.blockMethods = [
     'list',
     'lineHeading',
     'html',
-    'definition',
     'footnoteDefinition',
+    'definition',
     'looseTable',
     'table',
     'paragraph'

diff --git a/test/input/footnote-like.text b/test/input/footnote-like.text
@@ -1,6 +1,3 @@
-This looks like a footnote, but is in fact, a [link][^link].
 This one isn't even [defined][^foo].
 
-[^link]: <~/foo/bar.baz>
-
 [^both][invalid], [^this too][].
diff --git a/test/input/footnote-without-space.text b/test/input/footnote-without-space.text
@@ -0,0 +1,5 @@
+foo[^abc] bar. foo[^xyz] bar
+
+[^abc]: Baz baz
+
+[^xyz]: Baz
diff --git a/test/tree/footnote-like.footnotes.json b/test/tree/footnote-like.footnotes.json
@@ -6,67 +6,17 @@
       "children": [
         {
           "type": "text",
-          "value": "This looks like a footnote, but is in fact, a ",
+          "value": "This one isn't even ",
           "position": {
             "start": {
               "line": 1,
               "column": 1
             },
             "end": {
               "line": 1,
-              "column": 47
-            },
-            "indent": []
-          }
-        },
-        {
-          "type": "linkReference",
-          "identifier": "^link",
-          "referenceType": "full",
-          "children": [
-            {
-              "type": "text",
-              "value": "link",
-              "position": {
-                "start": {
-                  "line": 1,
-                  "column": 48
-                },
-                "end": {
-                  "line": 1,
-                  "column": 52
-                },
-                "indent": []
-              }
-            }
-          ],
-          "position": {
-            "start": {
-              "line": 1,
-              "column": 47
-            },
-            "end": {
-              "line": 1,
-              "column": 60
-            },
-            "indent": []
-          }
-        },
-        {
-          "type": "text",
-          "value": ".\nThis one isn't even ",
-          "position": {
-            "start": {
-              "line": 1,
-              "column": 60
-            },
-            "end": {
-              "line": 2,
               "column": 21
             },
-            "indent": [
-              1
-            ]
+            "indent": []
           }
         },
         {
@@ -79,11 +29,11 @@
               "value": "defined",
               "position": {
                 "start": {
-                  "line": 2,
+                  "line": 1,
                   "column": 22
                 },
                 "end": {
-                  "line": 2,
+                  "line": 1,
                   "column": 29
                 },
                 "indent": []
@@ -92,11 +42,11 @@
           ],
           "position": {
             "start": {
-              "line": 2,
+              "line": 1,
               "column": 21
             },
             "end": {
-              "line": 2,
+              "line": 1,
               "column": 36
             },
             "indent": []
@@ -107,11 +57,11 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 2,
+              "line": 1,
               "column": 36
             },
             "end": {
-              "line": 2,
+              "line": 1,
               "column": 37
             },
             "indent": []
@@ -124,28 +74,9 @@
           "column": 1
         },
         "end": {
-          "line": 2,
+          "line": 1,
           "column": 37
         },
-        "indent": [
-          1
-        ]
-      }
-    },
-    {
-      "type": "definition",
-      "identifier": "^link",
-      "title": null,
-      "link": "~/foo/bar.baz",
-      "position": {
-        "start": {
-          "line": 4,
-          "column": 1
-        },
-        "end": {
-          "line": 4,
-          "column": 25
-        },
         "indent": []
       }
     },
@@ -162,11 +93,11 @@
               "value": "^both",
               "position": {
                 "start": {
-                  "line": 6,
+                  "line": 3,
                   "column": 3
                 },
                 "end": {
-                  "line": 6,
+                  "line": 3,
                   "column": 8
                 },
                 "indent": []
@@ -175,11 +106,11 @@
           ],
           "position": {
             "start": {
-              "line": 6,
+              "line": 3,
               "column": 1
             },
             "end": {
-              "line": 6,
+              "line": 3,
               "column": 17
             },
             "indent": []
@@ -190,11 +121,11 @@
           "value": ", ",
           "position": {
             "start": {
-              "line": 6,
+              "line": 3,
               "column": 17
             },
             "end": {
-              "line": 6,
+              "line": 3,
               "column": 19
             },
             "indent": []
@@ -210,11 +141,11 @@
               "value": "^this too",
               "position": {
                 "start": {
-                  "line": 6,
+                  "line": 3,
                   "column": 21
                 },
                 "end": {
-                  "line": 6,
+                  "line": 3,
                   "column": 30
                 },
                 "indent": []
@@ -223,11 +154,11 @@
           ],
           "position": {
             "start": {
-              "line": 6,
+              "line": 3,
               "column": 19
             },
             "end": {
-              "line": 6,
+              "line": 3,
               "column": 32
             },
             "indent": []
@@ -238,11 +169,11 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 6,
+              "line": 3,
               "column": 32
             },
             "end": {
-              "line": 6,
+              "line": 3,
               "column": 33
             },
             "indent": []
@@ -251,11 +182,11 @@
       ],
       "position": {
         "start": {
-          "line": 6,
+          "line": 3,
           "column": 1
         },
         "end": {
-          "line": 6,
+          "line": 3,
           "column": 33
         },
         "indent": []
@@ -268,7 +199,7 @@
       "column": 1
     },
     "end": {
-      "line": 7,
+      "line": 4,
       "column": 1
     }
   }