Merge #43 from justinmk/fixes

Author: justinmk

corpus/codespan.txt

@@ -40,9 +40,11 @@ an error`.
         (word))
       (word)
       (word)
-      (ERROR
+      (codespan
         (word)
-        (word))
+        (MISSING "`")))
+    (line
+      (word)
       (word))))
 
 ================================================================================

corpus/heading3-column_heading.txt

@@ -236,6 +236,13 @@ NOT column_heading
 tilde ~/foo/bar foo~ bar
 trailing-space-is-NOT-column_heading ~ 
 
+buffer-diagram
+|-----|
+|foo  |
+|~    |
+|~    |
+|-----|
+
 
 --------------------------------------------------------------------------------
 
@@ -245,7 +252,30 @@ trailing-space-is-NOT-column_heading ~
       (word)
       (word)
       (word)
+      (word)
       (word))
     (line
       (word)
-      (word))))
+      (word)))
+  (block
+    (line
+      (word))
+    (line
+      (taglink
+        (word)))
+    (line
+      (word)
+      (ERROR
+        (word))
+      (word))
+    (line
+      (word)
+      (word)
+      (word))
+    (line
+      (word)
+      (word)
+      (word))
+    (line
+      (taglink
+        (word)))))

corpus/line_block.txt

@@ -53,7 +53,7 @@ text text text text
       (word)
       (word)
       (word))
-    (MISSING "help_file_token1")))
+    (MISSING "<")))
 
 ================================================================================
 blocks: with blank line at end of document
@@ -119,6 +119,7 @@ li continues
         (word)
         (word)
         (word)
+        (word)
         (word))
       (line
         (optionlink
@@ -128,6 +129,7 @@ li continues
           (word))))
     (line_li
       (line
+        (word)
         (word)
         (word)
         (word))

corpus/optionlink.txt

@@ -136,10 +136,12 @@ x `after_codespan`'s
       (argument
         (word))
       (word))
-    (ERROR
+    (line
       (word)
       (codespan
-        (word)))))
+        (word))
+      (word
+        (MISSING "'")))))
 
 ================================================================================
 NOT optionlink 3 (FIXME)

corpus/taglink.txt

@@ -90,17 +90,16 @@ Note: ":autocmd" can...
   (block
     (line
       (word)
-      (taglink
-        (word)
-        (MISSING "|"))
+      (word)
+      (ERROR
+        (word))
       (word)
       (word))
     (line
-      (word
-        (MISSING "_word_common_token5")))
+      (word))
     (line
       (word)
-      (ERROR))
+      (word))
     (line
       (word)
       (word)

grammar.js

@@ -21,7 +21,7 @@ module.exports = grammar({
   rules: {
     help_file: ($) =>
       seq(
-        repeat(/[\t ]*\n/),  // Eat whitespace at top of file.
+        repeat($._blank),  // Eat blank lines at top of file.
         repeat($.block),
       ),
 
@@ -67,19 +67,19 @@ module.exports = grammar({
       seq("'", token.immediate(/[^'\n\t ]*[^'a-z\n\t ][^'\n\t ]*/), token.immediate("'")),
       // NOT optionlink: single char surrounded by "'".
       seq("'", token.immediate(/[^'\n\t ]/), token.immediate("'")),
-      // NOT taglink: single "|".
-      /\|[\t ]/,
-      // NOT taglink: "|foo".
-      seq('|', /[^|\n\t ]+/),
-      // NOT taglink: "||".
-      /\|\|*/,
+      // NOT taglink: "||", "|"
+      /\|\|+/,
+      '|',
+      // NOT listitem: "-" or "•" followed by tab.
+      /[-•]\t/,
       // NOT argument:
       '{',
       '}',
       '{}',
       /\{\{+[0-9]*/,
       '(',
       /\w+\(/,
+      '~',
     ),
 
     keycode: () => choice(
@@ -126,7 +126,7 @@ module.exports = grammar({
     )),
 
     // Lines.
-    _blank: () => field('blank', /[\t ]*\n/),
+    _blank: () => field('blank', '\n'),
     line: ($) => choice(
       $.column_heading,
       $.h1,

src/grammar.json

@@ -7,8 +7,8 @@
         {
           "type": "REPEAT",
           "content": {
-            "type": "PATTERN",
-            "value": "[\\t ]*\\n"
+            "type": "SYMBOL",
+            "name": "_blank"
           }
         },
         {
@@ -219,24 +219,15 @@
         },
         {
           "type": "PATTERN",
-          "value": "\\|[\\t ]"
+          "value": "\\|\\|+"
         },
         {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "|"
-            },
-            {
-              "type": "PATTERN",
-              "value": "[^|\\n\\t ]+"
-            }
-          ]
+          "type": "STRING",
+          "value": "|"
         },
         {
           "type": "PATTERN",
-          "value": "\\|\\|*"
+          "value": "[-•]\\t"
         },
         {
           "type": "STRING",
@@ -261,6 +252,10 @@
         {
           "type": "PATTERN",
           "value": "\\w+\\("
+        },
+        {
+          "type": "STRING",
+          "value": "~"
         }
       ]
     },
@@ -448,8 +443,8 @@
       "type": "FIELD",
       "name": "blank",
       "content": {
-        "type": "PATTERN",
-        "value": "[\\t ]*\\n"
+        "type": "STRING",
+        "value": "\n"
       }
     },
     "line": {

src/node-types.json

@@ -18,7 +18,18 @@
   {
     "type": "block",
     "named": true,
-    "fields": {},
+    "fields": {
+      "blank": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "\n",
+            "named": false
+          }
+        ]
+      }
+    },
     "children": {
       "multiple": true,
       "required": true,
@@ -224,7 +235,18 @@
   {
     "type": "help_file",
     "named": true,
-    "fields": {},
+    "fields": {
+      "blank": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "\n",
+            "named": false
+          }
+        ]
+      }
+    },
     "children": {
       "multiple": true,
       "required": false,
@@ -436,5 +458,9 @@
   {
     "type": "}",
     "named": false
+  },
+  {
+    "type": "~",
+    "named": false
   }
 ]