Merge #108 argument in "vim.foo({bar})"

Author: justinmk

corpus/arguments.txt

@@ -37,6 +37,7 @@ list of { uri:string, name: string } tables
       (word)
       (word)
       (word)
+      (word)
       (word))))
 
 ================================================================================
@@ -61,13 +62,61 @@ multiple arguments on the same line
 argument in parentheses
 ================================================================================
 ({aaa})
+vim.foo({bar})
+vim.foo( {bar})
+nvim_foo({bar})
+nvim_foo({bar},{baz})
+nvim_foo({bar}, {baz})
+nvim_buf_detach_event[{buf}]
 
 
 --------------------------------------------------------------------------------
 
 (help_file
   (block
     (line
+      (word)
+      (argument
+        (word))
+      (word))
+    (line
+      (word)
+      (word)
+      (argument
+        (word))
+      (word))
+    (line
+      (word)
+      (word)
+      (argument
+        (word))
+      (word))
+    (line
+      (word)
+      (word)
+      (argument
+        (word))
+      (word))
+    (line
+      (word)
+      (word)
+      (argument
+        (word))
+      (word)
+      (argument
+        (word))
+      (word))
+    (line
+      (word)
+      (word)
+      (argument
+        (word))
+      (word)
+      (argument
+        (word))
+      (word))
+    (line
+      (word)
       (word)
       (argument
         (word))
@@ -103,8 +152,6 @@ EXTERNAL *netrw-externapp* {{{2
       (word)
       (word)
       (word)
-      (word)
-      (word)
       (word))
     (line
       (word)
@@ -138,7 +185,6 @@ EXTERNAL *netrw-externapp* {{{2
       (word)
       (word)
       (word)
-      (word)
       (word))
     (line
       (word)

corpus/codeblock.txt

@@ -331,6 +331,7 @@ To test for a non-empty string, use empty(): >
       (word)
       (word)
       (word)
+      (word)
       (word))
     (line
       (word)
@@ -352,6 +353,8 @@ To test for a non-empty string, use empty(): >
       (word)
       (word)
       (word)
+      (word)
+      (word)
       (codeblock
         (code
           (line))))))
@@ -393,6 +396,7 @@ codeblock stop and start on same line
       (tag
         (word)))
     (line
+      (word)
       (word)
       (word)
       (word))
@@ -437,7 +441,7 @@ Not a language annotation: >lua is not at EOL
       (word)
       (word))
     (line
-     (word)))
+      (word)))
   (block
     (line
       (word)
@@ -447,18 +451,18 @@ Not a language annotation: >lua is not at EOL
       (word)
       (word))
     (line
-     (word)))
+      (word)))
   (block
-   (line
-    (word)
-    (word)
-    (word)
-    (word)
-    (word)
-    (word)
-    (word)
-    (word)
-    (word)
-    (word))
-   (line
-    (word))))
+    (line
+      (word)
+      (word)
+      (word)
+      (word)
+      (word)
+      (word)
+      (word)
+      (word)
+      (word)
+      (word))
+    (line
+      (word))))

corpus/heading3-column_heading.txt

@@ -126,6 +126,7 @@ nvim_ui_try_resize({width}, {height})                   *nvim_ui_try_resize()*
         (word))))
   (block
     (line
+      (word)
       (word)
       (argument
         (word))

corpus/line_block.txt

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

corpus/optionlink.txt

@@ -78,6 +78,7 @@ Regular	  /	:help /[
       (word)
       (word))
     (line
+      (word)
       (word)
       (word)
       (word))
@@ -101,7 +102,6 @@ Regular	  /	:help /[
       (word)
       (argument
         (word))
-      (word)
       (word))
     (line
       (word)
@@ -120,6 +120,7 @@ Regular	  /	:help /[
       (word)
       (word)
       (word)
+      (word)
       (word))))
 
 ================================================================================

corpus/taglink.txt

@@ -56,6 +56,8 @@ Hello |world| hello
       (taglink
         (word))
       (word)
+      (word)
+      (word)
       (word))
     (line
       (taglink

corpus/url.txt

@@ -54,4 +54,11 @@ markdown: [https://neovim.io/doc/user/#yay](https://neovim.io/doc/user/#yay).
       (word))
     (line
       (word)
+      (word)
+      (url
+        (word))
+      (word)
+      (word)
+      (url
+        (word))
       (word))))

grammar.js

@@ -30,10 +30,7 @@ module.exports = grammar({
       $._atom_common,
     ),
     word: ($) => choice(
-      // Try the more-restrictive pattern at higher relative precedence, so that things like
-      // "foo({a})" parse as "(word) (argument)" instead of "(word)".
-      token(prec(-1, /[^\n\t{ ][^\n\t ]*/)),
-      token(prec(-2, /[^\n\t ]+/)),
+      token(prec(-1, /[^,(\[\n\t ]+/)),
       $._word_common,
     ),
 
@@ -43,7 +40,7 @@ module.exports = grammar({
     ),
     word_noli: ($) => choice(
       // Lines contained by line_li must not start with a listitem symbol.
-      token(prec(-1, /[^-•\n\t ][^\n\t ]*/)),
+      token(prec(-1, /[^-•\n\t ][^(\[\n\t ]*/)),
       token(prec(-1, /[-•][^\n\t ]+/)),
       $._word_common,
     ),
@@ -76,14 +73,15 @@ module.exports = grammar({
       '|',
       // NOT argument:
       '{',
-      '}',
       '{}',
       /\{\{+[0-9]*/,
+
       '(',
-      /\w+\(/,
+      '[',
       '~',
       // NOT codeblock: random ">" in middle of the motherflippin text.
       '>',
+      ',',
     ),
 
     keycode: () => choice(