fix: unclosed "{", argument with whitespace #41

fix #34 fix #38 fix #39 fix #40
neovim · Oct 14, 2022 · 22d5dcd · 22d5dcd
1 parent bf6a269
commit 22d5dcd
Show file tree

Hide file tree

Showing 5 changed files with 4,883 additions and 3,811 deletions.
diff --git a/corpus/arguments.txt b/corpus/arguments.txt
@@ -1,7 +1,10 @@
 ================================================================================
-simple argument
+argument
 ================================================================================
-This in an argument: {arg}
+argument: {arg}
+argument: {arg arg}
+CTRL-R CTRL-R {register CTRL-F}
+list of { uri:string, name: string } tables
 
 
 --------------------------------------------------------------------------------
@@ -10,11 +13,26 @@ This in an argument: {arg}
   (block
     (line
       (word)
+      (argument
+        (word)))
+    (line
       (word)
+      (argument
+        (word)))
+    (line
       (word)
-      (word)
+      (keycode)
       (argument
-        (word)))))
+        (word)))
+    (line
+      (word)
+      (word)
+      (word)
+      (word)
+      (word)
+      (word)
+      (word)
+      (word))))
 
 ================================================================================
 multiple arguments on the same line
@@ -54,6 +72,14 @@ argument in parentheses
 NOT an argument
 ================================================================================
 {foo "{bar}" `{baz}` |{baz| } {}
+foo { bar 
+{ {} foo{{ foo{{{
+ {{ 
+ {{{ 
+{ }	foo
+,	inside { }: 
+\}	literal } x
+\{	literal { x
 
 ===============
 3. Netrw *netrw-ref* {{{1
@@ -66,15 +92,50 @@ EXTERNAL *netrw-externapp* {{{2
 (help_file
   (block
     (line
+      (word)
+      (ERROR
+        (word))
       (argument
-        (word)
-        (MISSING "}"))
+        (word))
       (word)
       (codespan
         (word))
       (taglink
         (word))
       (word)
+      (word))
+    (line
+      (word)
+      (word)
+      (word))
+    (line
+      (word)
+      (word)
+      (word)
+      (word))
+    (line
+      (word))
+    (line
+      (word))
+    (line
+      (word)
+      (word)
+      (word))
+    (line
+      (word)
+      (word)
+      (word)
+      (word)
+      (word))
+    (line
+      (word)
+      (word)
+      (word)
+      (word))
+    (line
+      (word)
+      (word)
+      (word)
       (word)))
   (block
     (line

diff --git a/grammar.js b/grammar.js
@@ -73,8 +73,10 @@ module.exports = grammar({
       seq('|', /[^|\n\t ]+/),
       // NOT taglink: "||".
       /\|\|*/,
-      // NOT argument: "{}".
-      /\{\}/,
+      // NOT argument:
+      '{',
+      '}',
+      '{}',
       /\{\{+[0-9]*/,
       '(',
       /\w+\(/,
@@ -201,7 +203,7 @@ module.exports = grammar({
     // Inline code (may contain whitespace!): `foo bar`
     codespan: ($) => _word($, /[^``\n]+/, '`', '`'),
     // Argument: {arg}
-    argument: ($) => _word($, /[^{}\n\t ]+/, '{', '}'),
+    argument: ($) => _word($, /[^{}\n\t ][^{}\n\t]*/, '{', '}'),
   },
 });
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -239,8 +239,16 @@
           "value": "\\|\\|*"
         },
         {
-          "type": "PATTERN",
-          "value": "\\{\\}"
+          "type": "STRING",
+          "value": "{"
+        },
+        {
+          "type": "STRING",
+          "value": "}"
+        },
+        {
+          "type": "STRING",
+          "value": "{}"
         },
         {
           "type": "PATTERN",
@@ -893,7 +901,7 @@
               "type": "IMMEDIATE_TOKEN",
               "content": {
                 "type": "PATTERN",
-                "value": "[^{}\\n\\t ]+"
+                "value": "[^{}\\n\\t ][^{}\\n\\t]*"
               }
             },
             "named": true,

diff --git a/src/node-types.json b/src/node-types.json
@@ -425,6 +425,10 @@
     "type": "{",
     "named": false
   },
+  {
+    "type": "{}",
+    "named": false
+  },
   {
     "type": "|",
     "named": false