Skip to content

Commit 8c0469d

Browse files
justinmkjustinmk
authored
Merge #108 argument in "vim.foo({bar})"
2 parents 755b801 + 4531955 commit 8c0469d

File tree

11 files changed

+4310
-4017
lines changed

11 files changed

+4310
-4017
lines changed

‎corpus/arguments.txt

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ list of { uri:string, name: string } tables
3737
(word)
3838
(word)
3939
(word)
40+
(word)
4041
(word))))
4142

4243
================================================================================
@@ -61,13 +62,61 @@ multiple arguments on the same line
6162
argument in parentheses
6263
================================================================================
6364
({aaa})
65+
vim.foo({bar})
66+
vim.foo( {bar})
67+
nvim_foo({bar})
68+
nvim_foo({bar},{baz})
69+
nvim_foo({bar}, {baz})
70+
nvim_buf_detach_event[{buf}]
6471

6572

6673
--------------------------------------------------------------------------------
6774

6875
(help_file
6976
(block
7077
(line
78+
(word)
79+
(argument
80+
(word))
81+
(word))
82+
(line
83+
(word)
84+
(word)
85+
(argument
86+
(word))
87+
(word))
88+
(line
89+
(word)
90+
(word)
91+
(argument
92+
(word))
93+
(word))
94+
(line
95+
(word)
96+
(word)
97+
(argument
98+
(word))
99+
(word))
100+
(line
101+
(word)
102+
(word)
103+
(argument
104+
(word))
105+
(word)
106+
(argument
107+
(word))
108+
(word))
109+
(line
110+
(word)
111+
(word)
112+
(argument
113+
(word))
114+
(word)
115+
(argument
116+
(word))
117+
(word))
118+
(line
119+
(word)
71120
(word)
72121
(argument
73122
(word))
@@ -103,8 +152,6 @@ EXTERNAL *netrw-externapp* {{{2
103152
(word)
104153
(word)
105154
(word)
106-
(word)
107-
(word)
108155
(word))
109156
(line
110157
(word)
@@ -138,7 +185,6 @@ EXTERNAL *netrw-externapp* {{{2
138185
(word)
139186
(word)
140187
(word)
141-
(word)
142188
(word))
143189
(line
144190
(word)

‎corpus/codeblock.txt

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ To test for a non-empty string, use empty(): >
331331
(word)
332332
(word)
333333
(word)
334+
(word)
334335
(word))
335336
(line
336337
(word)
@@ -352,6 +353,8 @@ To test for a non-empty string, use empty(): >
352353
(word)
353354
(word)
354355
(word)
356+
(word)
357+
(word)
355358
(codeblock
356359
(code
357360
(line))))))
@@ -393,6 +396,7 @@ codeblock stop and start on same line
393396
(tag
394397
(word)))
395398
(line
399+
(word)
396400
(word)
397401
(word)
398402
(word))
@@ -437,7 +441,7 @@ Not a language annotation: >lua is not at EOL
437441
(word)
438442
(word))
439443
(line
440-
(word)))
444+
(word)))
441445
(block
442446
(line
443447
(word)
@@ -447,18 +451,18 @@ Not a language annotation: >lua is not at EOL
447451
(word)
448452
(word))
449453
(line
450-
(word)))
454+
(word)))
451455
(block
452-
(line
453-
(word)
454-
(word)
455-
(word)
456-
(word)
457-
(word)
458-
(word)
459-
(word)
460-
(word)
461-
(word)
462-
(word))
463-
(line
464-
(word))))
456+
(line
457+
(word)
458+
(word)
459+
(word)
460+
(word)
461+
(word)
462+
(word)
463+
(word)
464+
(word)
465+
(word)
466+
(word))
467+
(line
468+
(word))))

‎corpus/heading3-column_heading.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ nvim_ui_try_resize({width}, {height}) *nvim_ui_try_resize()*
126126
(word))))
127127
(block
128128
(line
129+
(word)
129130
(word)
130131
(argument
131132
(word))

‎corpus/line_block.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ li continues
113113
(line))
114114
(line_li
115115
(line
116+
(word)
116117
(word))
117118
(line)
118119
(line

‎corpus/optionlink.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ Regular / :help /[
7878
(word)
7979
(word))
8080
(line
81+
(word)
8182
(word)
8283
(word)
8384
(word))
@@ -101,7 +102,6 @@ Regular / :help /[
101102
(word)
102103
(argument
103104
(word))
104-
(word)
105105
(word))
106106
(line
107107
(word)
@@ -120,6 +120,7 @@ Regular / :help /[
120120
(word)
121121
(word)
122122
(word)
123+
(word)
123124
(word))))
124125

125126
================================================================================

‎corpus/taglink.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ Hello |world| hello
5656
(taglink
5757
(word))
5858
(word)
59+
(word)
60+
(word)
5961
(word))
6062
(line
6163
(taglink

‎corpus/url.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,11 @@ markdown: [https://neovim.io/doc/user/#yay](https://neovim.io/doc/user/#yay).
5454
(word))
5555
(line
5656
(word)
57+
(word)
58+
(url
59+
(word))
60+
(word)
61+
(word)
62+
(url
63+
(word))
5764
(word))))

‎grammar.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@ module.exports = grammar({
3030
$._atom_common,
3131
),
3232
word: ($) => choice(
33-
// Try the more-restrictive pattern at higher relative precedence, so that things like
34-
// "foo({a})" parse as "(word) (argument)" instead of "(word)".
35-
token(prec(-1, /[^\n\t{ ][^\n\t ]*/)),
36-
token(prec(-2, /[^\n\t ]+/)),
33+
token(prec(-1, /[^,(\[\n\t ]+/)),
3734
$._word_common,
3835
),
3936

@@ -43,7 +40,7 @@ module.exports = grammar({
4340
),
4441
word_noli: ($) => choice(
4542
// Lines contained by line_li must not start with a listitem symbol.
46-
token(prec(-1, /[^-•\n\t ][^\n\t ]*/)),
43+
token(prec(-1, /[^-•\n\t ][^(\[\n\t ]*/)),
4744
token(prec(-1, /[-•][^\n\t ]+/)),
4845
$._word_common,
4946
),
@@ -76,14 +73,15 @@ module.exports = grammar({
7673
'|',
7774
// NOT argument:
7875
'{',
79-
'}',
8076
'{}',
8177
/\{\{+[0-9]*/,
78+
8279
'(',
83-
/\w+\(/,
80+
'[',
8481
'~',
8582
// NOT codeblock: random ">" in middle of the motherflippin text.
8683
'>',
84+
',',
8785
),
8886

8987
keycode: () => choice(

‎src/grammar.json

Lines changed: 8 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/node-types.json

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)