fix: invalid optionlink #48

fix #45
fix #46

Author: justinmk

corpus/line_block.txt

@@ -132,6 +132,7 @@ li continues
         (word)
         (word)
         (word)
+        (word)
         (word))
       (line)
       (line

corpus/optionlink.txt

@@ -101,8 +101,22 @@ number: '04' 'ISO-10646-1' 'python3'
       (word)
       (word)
       (word)
+      (word)
+      (tag
+        (word)
+        (MISSING "*"))
+      (word)
+      (word)
+      (word)
+      (ERROR
+        (word))
+      (argument
+        (word))
+      (word)
       (word))
     (line
+      (word)
+      (word)
       (word)
       (word)
       (word)
@@ -121,7 +135,7 @@ number: '04' 'ISO-10646-1' 'python3'
       (word))))
 
 ================================================================================
-NOT optionlink 2 (FIXME)
+NOT optionlink 2
 ================================================================================
 '{a-z}  `{a-z} foo
 x `after_codespan`'s
@@ -130,21 +144,22 @@ x `after_codespan`'s
 --------------------------------------------------------------------------------
 
 (help_file
-  (ERROR)
   (block
     (line
-      (argument
-        (word))
-      (word))
+      (word)
+      (word)
+      (codespan
+        (word)
+        (MISSING "`")))
     (line
       (word)
       (codespan
         (word))
-      (word
-        (MISSING "'")))))
+      (word)
+      (ERROR))))
 
 ================================================================================
-NOT optionlink 3 (FIXME)
+NOT optionlink 3
 ================================================================================
 foo '"\ '.  Notice
 |foo|
@@ -156,7 +171,9 @@ foo '"\ '.  Notice
   (block
     (line
       (word)
-      (ERROR)
+      (word)
+      (word)
+      (word)
       (word))
     (line
       (taglink

corpus/taglink.txt

@@ -129,6 +129,8 @@ Note: ":autocmd" can...
       (word)
       (word))
     (line
+      (word)
+      (word)
       (word)
       (word))
     (line

grammar.js

@@ -62,9 +62,9 @@ module.exports = grammar({
     // Explicit special cases: these are plaintext, not errors.
     _word_common: () => choice(
       // NOT optionlink: single "'".
-      /'[\t ]/,
-      // NOT optionlink: contains any non-lowercase char.
-      seq("'", token.immediate(/[^'\n\t ]*[^'a-z\n\t ][^'\n\t ]*/), token.immediate("'")),
+      "'",
+      // NOT optionlink: followed by non-lowercase char.
+      seq("'", token.immediate(/[a-z]*[^'a-z\n\t ][a-z]*/), optional(token.immediate("'"))),
       // NOT optionlink: single char surrounded by "'".
       seq("'", token.immediate(/[^'\n\t ]/), token.immediate("'")),
       // NOT taglink: "||", "|"

src/grammar.json

@@ -168,8 +168,8 @@
       "type": "CHOICE",
       "members": [
         {
-          "type": "PATTERN",
-          "value": "'[\\t ]"
+          "type": "STRING",
+          "value": "'"
         },
         {
           "type": "SEQ",
@@ -182,15 +182,23 @@
               "type": "IMMEDIATE_TOKEN",
               "content": {
                 "type": "PATTERN",
-                "value": "[^'\\n\\t ]*[^'a-z\\n\\t ][^'\\n\\t ]*"
+                "value": "[a-z]*[^'a-z\\n\\t ][a-z]*"
               }
             },
             {
-              "type": "IMMEDIATE_TOKEN",
-              "content": {
-                "type": "STRING",
-                "value": "'"
-              }
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "IMMEDIATE_TOKEN",
+                  "content": {
+                    "type": "STRING",
+                    "value": "'"
+                  }
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
             }
           ]
         },