Fix handling of definitions in commonmark-mode

Definitions in commonmark-mode are not allowed to follow a list-item: ```md * [bar][]. [bar]: http://google.com ``` ...should be rendered something like: ```md * [bar][]. [bar]: http://google.com ``` Closes GH-111.
remarkjs · Dec 22, 2015 · b7d6e53 · b7d6e53
1 parent 6e74759
commit b7d6e53
Show file tree

Hide file tree

Showing 17 changed files with 3,889 additions and 341 deletions.
diff --git a/lib/parse.js b/lib/parse.js
@@ -1872,15 +1872,14 @@ function tokenizeList(eat, value, silent) {
  break;
  }
 
- // TODO: Should not be possible in commonmark.
- // if (!commonmark) {
+ if (!commonmark) {
  if (
  tokenizers.definition.call(self, eat, line, true) ||
  tokenizers.footnoteDefinition.call(self, eat, line, true)
  ) {
  break;
  }
- // }
+ }
 
  item.value = item.value.concat(emptyLines, line);
  allLines = allLines.concat(emptyLines, line);

diff --git a/test/tree/def-blocks.commonmark.json b/test/tree/def-blocks.commonmark.json
@@ -385,15 +385,65 @@
  "children": [
  {
  "type": "text",
- "value": "hello",
+ "value": "hello\n",
  "position": {
  "start": {
  "line": 14,
  "column": 3
  },
  "end": {
- "line": 14,
- "column": 8
+ "line": 15,
+ "column": 1
+ },
+ "indent": [
+ 1
+ ]
+ }
+ },
+ {
+ "type": "linkReference",
+ "identifier": "4",
+ "referenceType": "shortcut",
+ "children": [
+ {
+ "type": "text",
+ "value": "4",
+ "position": {
+ "start": {
+ "line": 15,
+ "column": 2
+ },
+ "end": {
+ "line": 15,
+ "column": 3
+ },
+ "indent": []
+ }
+ }
+ ],
+ "position": {
+ "start": {
+ "line": 15,
+ "column": 1
+ },
+ "end": {
+ "line": 15,
+ "column": 4
+ },
+ "indent": []
+ }
+ },
+ {
+ "type": "text",
+ "value": ": hello",
+ "position": {
+ "start": {
+ "line": 15,
+ "column": 4
+ },
+ "end": {
+ "line": 15,
+ "column": 11
  },
  "indent": []
  }
@@ -405,10 +455,12 @@
  "column": 3
  },
  "end": {
- "line": 14,
- "column": 8
+ "line": 15,
+ "column": 11
  },
- "indent": []
+ "indent": [
+ 1
+ ]
  }
  }
  ],
@@ -418,10 +470,12 @@
  "column": 1
  },
  "end": {
- "line": 14,
- "column": 8
+ "line": 15,
+ "column": 11
  },
- "indent": []
+ "indent": [
+ 1
+ ]
  }
  }
  ],
@@ -430,28 +484,13 @@
  "line": 14,
  "column": 1
  },
- "end": {
- "line": 14,
- "column": 8
- },
- "indent": []
- }
- },
- {
- "type": "definition",
- "identifier": "4",
- "title": null,
- "link": "hello",
- "position": {
- "start": {
- "line": 15,
- "column": 1
- },
  "end": {
  "line": 15,
  "column": 11
  },
- "indent": []
+ "indent": [
+ 1
+ ]
  }
  },
  {