Skip to content

Commit 21c1d55

Browse files
committed
argument: drop unneeded special-cases
- Dropping ")" and "]" special-cases avoids 10 (out of ~30) new errors in a full `gen_help_html.validate()` run. - The /\w+\(/ special is no longer needed since "(" was added. - Other cases appear redundant, they don't affect test results nor `gen_help_html.validate()` results.
1 parent 69934ed commit 21c1d55

File tree

6 files changed

+21
-33
lines changed

6 files changed

+21
-33
lines changed

corpus/arguments.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,13 @@ nvim_buf_detach_event[{buf}]
9292
(word))
9393
(word))
9494
(line
95+
(word)
9596
(word)
9697
(argument
9798
(word))
9899
(word))
99100
(line
101+
(word)
100102
(word)
101103
(argument
102104
(word))
@@ -105,6 +107,7 @@ nvim_buf_detach_event[{buf}]
105107
(word))
106108
(word))
107109
(line
110+
(word)
108111
(word)
109112
(argument
110113
(word))
@@ -149,8 +152,6 @@ EXTERNAL *netrw-externapp* {{{2
149152
(word)
150153
(word)
151154
(word)
152-
(word)
153-
(word)
154155
(word))
155156
(line
156157
(word)
@@ -184,7 +185,6 @@ EXTERNAL *netrw-externapp* {{{2
184185
(word)
185186
(word)
186187
(word)
187-
(word)
188188
(word))
189189
(line
190190
(word)

corpus/codeblock.txt

+15-16
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ text
9090
(word)
9191
(taglink
9292
(word))
93-
(word)
9493
(word))
9594
(line
9695
(codeblock
@@ -442,7 +441,7 @@ Not a language annotation: >lua is not at EOL
442441
(word)
443442
(word))
444443
(line
445-
(word)))
444+
(word)))
446445
(block
447446
(line
448447
(word)
@@ -452,18 +451,18 @@ Not a language annotation: >lua is not at EOL
452451
(word)
453452
(word))
454453
(line
455-
(word)))
454+
(word)))
456455
(block
457-
(line
458-
(word)
459-
(word)
460-
(word)
461-
(word)
462-
(word)
463-
(word)
464-
(word)
465-
(word)
466-
(word)
467-
(word))
468-
(line
469-
(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

+1
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/optionlink.txt

-2
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,12 @@ Regular / :help /[
9696
(word)
9797
(word)
9898
(word)
99-
(word)
10099
(ERROR
101100
(word))
102101
(word)
103102
(word)
104103
(argument
105104
(word))
106-
(word)
107105
(word))
108106
(line
109107
(word)

corpus/url.txt

-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ markdown: [https://neovim.io/doc/user/#yay](https://neovim.io/doc/user/#yay).
5151
(word)
5252
(url
5353
(word))
54-
(word)
5554
(word))
5655
(line
5756
(word)
@@ -62,5 +61,4 @@ markdown: [https://neovim.io/doc/user/#yay](https://neovim.io/doc/user/#yay).
6261
(word)
6362
(url
6463
(word))
65-
(word)
6664
(word))))

grammar.js

+2-10
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

@@ -76,16 +73,11 @@ module.exports = grammar({
7673
'|',
7774
// NOT argument:
7875
'{',
79-
'}',
8076
'{}',
8177
/\{\{+[0-9]*/,
78+
8279
'(',
83-
')',
8480
'[',
85-
']',
86-
"['",
87-
"']",
88-
/\w+\(/,
8981
'~',
9082
// NOT codeblock: random ">" in middle of the motherflippin text.
9183
'>',

0 commit comments

Comments
 (0)