Merge #31 fix: errors from single ' or |

neovim · Oct 9, 2022 · c03640a · c03640a
2 parents d595021 + 6cd420d
commit c03640a
Show file tree

Hide file tree

Showing 5 changed files with 3,257 additions and 3,188 deletions.
diff --git a/corpus/optionlink.txt b/corpus/optionlink.txt
@@ -28,6 +28,40 @@ world 'hello' world
         (word))
       (word))))
 
+================================================================================
+NOT optionlink: ' followed by whitespace
+================================================================================
+'fillchars'
+	  stl		' ' or '^'	statusline
+	  wbr		' '		windowbar
+          tricky:	' 'yes'
+
+
+--------------------------------------------------------------------------------
+
+(help_file
+  (block
+    (line
+      (optionlink
+        (word)))
+    (line
+      (word)
+      (word)
+      (word)
+      (word)
+      (word)
+      (word))
+    (line
+      (word)
+      (word)
+      (word)
+      (word))
+    (line
+      (word)
+      (word)
+      (optionlink
+        (word)))))
+
 ================================================================================
 NOT optionlink #7 #14
 ================================================================================

diff --git a/corpus/taglink.txt b/corpus/taglink.txt
@@ -70,8 +70,10 @@ taglink in parentheses
 ================================================================================
 NOT a taglink
 ================================================================================
-
 whitespace |world foo bar|
+	    |
+	rx  |
+	rx  |	ry
 adjacent || |||
 table-borders |=========| |---------|
 
@@ -93,6 +95,16 @@ Note: ":autocmd" can...
         (MISSING "|"))
       (word)
       (word))
+    (line
+      (word
+        (MISSING "_word_common_token5")))
+    (line
+      (word)
+      (ERROR))
+    (line
+      (word)
+      (word)
+      (word))
     (line
       (word)
       (word)

diff --git a/grammar.js b/grammar.js
@@ -62,13 +62,15 @@ module.exports = grammar({
     // Explicit special cases: these are plaintext, not errors.
     _word_common: () => choice(
       // NOT optionlink: single "'".
-      /[\t ]'[\t ]/,
+      /'[\t ]/,
       // NOT optionlink: contains any non-lowercase char.
       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 ]\|[\t ]/,
+      /\|[\t ]/,
+      // NOT taglink: "|foo".
+      seq('|', /[^|\n\t ]+/),
       // NOT taglink: "||".
       /\|\|*/,
       // NOT argument: "{}".

diff --git a/src/grammar.json b/src/grammar.json
@@ -169,7 +169,7 @@
       "members": [
         {
           "type": "PATTERN",
-          "value": "[\\t ]'[\\t ]"
+          "value": "'[\\t ]"
         },
         {
           "type": "SEQ",
@@ -219,7 +219,20 @@
         },
         {
           "type": "PATTERN",
-          "value": "[\\t ]\\|[\\t ]"
+          "value": "\\|[\\t ]"
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "|"
+            },
+            {
+              "type": "PATTERN",
+              "value": "[^|\\n\\t ]+"
+            }
+          ]
         },
         {
           "type": "PATTERN",