Skip to content

Commit b757ec1

Browse files
authored
Merge pull request #20 from haya14busa/fix-minlen
Fix minlen of builtin commands
2 parents f607c09 + fa6208e commit b757ec1

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

autoload/vimlparser.vim

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1995,8 +1995,8 @@ let s:VimLParser.builtin_commands = [
19951995
\ {'name': 'cNfile', 'minlen': 3, 'flags': 'RANGE|NOTADR|COUNT|TRLBAR|BANG', 'parser': 'parse_cmd_common'},
19961996
\ {'name': 'cabbrev', 'minlen': 2, 'flags': 'EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN', 'parser': 'parse_cmd_common'},
19971997
\ {'name': 'cabclear', 'minlen': 4, 'flags': 'EXTRA|TRLBAR|CMDWIN', 'parser': 'parse_cmd_common'},
1998-
\ {'name': 'caddbuffer', 'minlen': 5, 'flags': 'RANGE|NOTADR|WORD1|TRLBAR', 'parser': 'parse_cmd_common'},
1999-
\ {'name': 'caddexpr', 'minlen': 3, 'flags': 'NEEDARG|WORD1|NOTRLCOM|TRLBAR', 'parser': 'parse_cmd_common'},
1998+
\ {'name': 'caddbuffer', 'minlen': 3, 'flags': 'RANGE|NOTADR|WORD1|TRLBAR', 'parser': 'parse_cmd_common'},
1999+
\ {'name': 'caddexpr', 'minlen': 5, 'flags': 'NEEDARG|WORD1|NOTRLCOM|TRLBAR', 'parser': 'parse_cmd_common'},
20002000
\ {'name': 'caddfile', 'minlen': 5, 'flags': 'TRLBAR|FILE1', 'parser': 'parse_cmd_common'},
20012001
\ {'name': 'call', 'minlen': 3, 'flags': 'RANGE|NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN', 'parser': 'parse_cmd_call'},
20022002
\ {'name': 'catch', 'minlen': 3, 'flags': 'EXTRA|SBOXOK|CMDWIN', 'parser': 'parse_cmd_catch'},
@@ -2058,7 +2058,7 @@ let s:VimLParser.builtin_commands = [
20582058
\ {'name': 'diffpatch', 'minlen': 5, 'flags': 'EXTRA|FILE1|TRLBAR|MODIFY', 'parser': 'parse_cmd_common'},
20592059
\ {'name': 'diffput', 'minlen': 6, 'flags': 'RANGE|EXTRA|TRLBAR', 'parser': 'parse_cmd_common'},
20602060
\ {'name': 'diffsplit', 'minlen': 5, 'flags': 'EXTRA|FILE1|TRLBAR', 'parser': 'parse_cmd_common'},
2061-
\ {'name': 'diffthis', 'minlen': 8, 'flags': 'TRLBAR', 'parser': 'parse_cmd_common'},
2061+
\ {'name': 'diffthis', 'minlen': 5, 'flags': 'TRLBAR', 'parser': 'parse_cmd_common'},
20622062
\ {'name': 'digraphs', 'minlen': 3, 'flags': 'EXTRA|TRLBAR|CMDWIN', 'parser': 'parse_cmd_common'},
20632063
\ {'name': 'display', 'minlen': 2, 'flags': 'EXTRA|NOTRLCOM|TRLBAR|SBOXOK|CMDWIN', 'parser': 'parse_cmd_common'},
20642064
\ {'name': 'djump', 'minlen': 2, 'flags': 'BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA', 'parser': 'parse_cmd_common'},
@@ -2183,7 +2183,7 @@ let s:VimLParser.builtin_commands = [
21832183
\ {'name': 'lockmarks', 'minlen': 3, 'flags': 'NEEDARG|EXTRA|NOTRLCOM', 'parser': 'parse_cmd_common'},
21842184
\ {'name': 'lockvar', 'minlen': 5, 'flags': 'BANG|EXTRA|NEEDARG|SBOXOK|CMDWIN', 'parser': 'parse_cmd_lockvar'},
21852185
\ {'name': 'lolder', 'minlen': 3, 'flags': 'RANGE|NOTADR|COUNT|TRLBAR', 'parser': 'parse_cmd_common'},
2186-
\ {'name': 'lopen', 'minlen': 4, 'flags': 'RANGE|NOTADR|COUNT|TRLBAR', 'parser': 'parse_cmd_common'},
2186+
\ {'name': 'lopen', 'minlen': 3, 'flags': 'RANGE|NOTADR|COUNT|TRLBAR', 'parser': 'parse_cmd_common'},
21872187
\ {'name': 'lprevious', 'minlen': 2, 'flags': 'RANGE|NOTADR|COUNT|TRLBAR|BANG', 'parser': 'parse_cmd_common'},
21882188
\ {'name': 'lpfile', 'minlen': 3, 'flags': 'RANGE|NOTADR|COUNT|TRLBAR|BANG', 'parser': 'parse_cmd_common'},
21892189
\ {'name': 'lrewind', 'minlen': 2, 'flags': 'RANGE|NOTADR|COUNT|TRLBAR|BANG', 'parser': 'parse_cmd_common'},
@@ -2315,7 +2315,7 @@ let s:VimLParser.builtin_commands = [
23152315
\ {'name': 'sbnext', 'minlen': 3, 'flags': 'RANGE|NOTADR|COUNT|TRLBAR', 'parser': 'parse_cmd_common'},
23162316
\ {'name': 'sbprevious', 'minlen': 3, 'flags': 'RANGE|NOTADR|COUNT|TRLBAR', 'parser': 'parse_cmd_common'},
23172317
\ {'name': 'sbrewind', 'minlen': 3, 'flags': 'TRLBAR', 'parser': 'parse_cmd_common'},
2318-
\ {'name': 'scriptnames', 'minlen': 5, 'flags': 'TRLBAR|CMDWIN', 'parser': 'parse_cmd_common'},
2318+
\ {'name': 'scriptnames', 'minlen': 3, 'flags': 'TRLBAR|CMDWIN', 'parser': 'parse_cmd_common'},
23192319
\ {'name': 'scriptencoding', 'minlen': 7, 'flags': 'WORD1|TRLBAR|CMDWIN', 'parser': 'parse_cmd_common'},
23202320
\ {'name': 'scscope', 'minlen': 3, 'flags': 'EXTRA|NOTRLCOM', 'parser': 'parse_cmd_common'},
23212321
\ {'name': 'set', 'minlen': 2, 'flags': 'TRLBAR|EXTRA|CMDWIN|SBOXOK', 'parser': 'parse_cmd_common'},
@@ -2371,7 +2371,7 @@ let s:VimLParser.builtin_commands = [
23712371
\ {'name': 'tNext', 'minlen': 2, 'flags': 'RANGE|NOTADR|BANG|TRLBAR|ZEROR', 'parser': 'parse_cmd_common'},
23722372
\ {'name': 'tabNext', 'minlen': 4, 'flags': 'RANGE|NOTADR|COUNT|TRLBAR', 'parser': 'parse_cmd_common'},
23732373
\ {'name': 'tabclose', 'minlen': 4, 'flags': 'RANGE|NOTADR|COUNT|BANG|TRLBAR|CMDWIN', 'parser': 'parse_cmd_common'},
2374-
\ {'name': 'tabdo', 'minlen': 5, 'flags': 'NEEDARG|EXTRA|NOTRLCOM', 'parser': 'parse_cmd_common'},
2374+
\ {'name': 'tabdo', 'minlen': 4, 'flags': 'NEEDARG|EXTRA|NOTRLCOM', 'parser': 'parse_cmd_common'},
23752375
\ {'name': 'tabedit', 'minlen': 4, 'flags': 'BANG|FILE1|RANGE|NOTADR|ZEROR|EDITCMD|ARGOPT|TRLBAR', 'parser': 'parse_cmd_common'},
23762376
\ {'name': 'tabfind', 'minlen': 4, 'flags': 'BANG|FILE1|RANGE|NOTADR|ZEROR|EDITCMD|ARGOPT|NEEDARG|TRLBAR', 'parser': 'parse_cmd_common'},
23772377
\ {'name': 'tabfirst', 'minlen': 6, 'flags': 'TRLBAR', 'parser': 'parse_cmd_common'},

go/builtin_commands.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ var builtin_commands = []*Cmd{
8484
{flags: "RANGE|NOTADR|COUNT|TRLBAR|BANG", minlen: 3, name: "cNfile", parser: "parse_cmd_common"},
8585
{flags: "EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN", minlen: 2, name: "cabbrev", parser: "parse_cmd_common"},
8686
{flags: "EXTRA|TRLBAR|CMDWIN", minlen: 4, name: "cabclear", parser: "parse_cmd_common"},
87-
{flags: "RANGE|NOTADR|WORD1|TRLBAR", minlen: 5, name: "caddbuffer", parser: "parse_cmd_common"},
88-
{flags: "NEEDARG|WORD1|NOTRLCOM|TRLBAR", minlen: 3, name: "caddexpr", parser: "parse_cmd_common"},
87+
{flags: "RANGE|NOTADR|WORD1|TRLBAR", minlen: 3, name: "caddbuffer", parser: "parse_cmd_common"},
88+
{flags: "NEEDARG|WORD1|NOTRLCOM|TRLBAR", minlen: 5, name: "caddexpr", parser: "parse_cmd_common"},
8989
{flags: "TRLBAR|FILE1", minlen: 5, name: "caddfile", parser: "parse_cmd_common"},
9090
{flags: "RANGE|NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN", minlen: 3, name: "call", parser: "parse_cmd_call"},
9191
{flags: "EXTRA|SBOXOK|CMDWIN", minlen: 3, name: "catch", parser: "parse_cmd_catch"},
@@ -147,7 +147,7 @@ var builtin_commands = []*Cmd{
147147
{flags: "EXTRA|FILE1|TRLBAR|MODIFY", minlen: 5, name: "diffpatch", parser: "parse_cmd_common"},
148148
{flags: "RANGE|EXTRA|TRLBAR", minlen: 6, name: "diffput", parser: "parse_cmd_common"},
149149
{flags: "EXTRA|FILE1|TRLBAR", minlen: 5, name: "diffsplit", parser: "parse_cmd_common"},
150-
{flags: "TRLBAR", minlen: 8, name: "diffthis", parser: "parse_cmd_common"},
150+
{flags: "TRLBAR", minlen: 5, name: "diffthis", parser: "parse_cmd_common"},
151151
{flags: "EXTRA|TRLBAR|CMDWIN", minlen: 3, name: "digraphs", parser: "parse_cmd_common"},
152152
{flags: "EXTRA|NOTRLCOM|TRLBAR|SBOXOK|CMDWIN", minlen: 2, name: "display", parser: "parse_cmd_common"},
153153
{flags: "BANG|RANGE|DFLALL|WHOLEFOLD|EXTRA", minlen: 2, name: "djump", parser: "parse_cmd_common"},
@@ -272,7 +272,7 @@ var builtin_commands = []*Cmd{
272272
{flags: "NEEDARG|EXTRA|NOTRLCOM", minlen: 3, name: "lockmarks", parser: "parse_cmd_common"},
273273
{flags: "BANG|EXTRA|NEEDARG|SBOXOK|CMDWIN", minlen: 5, name: "lockvar", parser: "parse_cmd_lockvar"},
274274
{flags: "RANGE|NOTADR|COUNT|TRLBAR", minlen: 3, name: "lolder", parser: "parse_cmd_common"},
275-
{flags: "RANGE|NOTADR|COUNT|TRLBAR", minlen: 4, name: "lopen", parser: "parse_cmd_common"},
275+
{flags: "RANGE|NOTADR|COUNT|TRLBAR", minlen: 3, name: "lopen", parser: "parse_cmd_common"},
276276
{flags: "RANGE|NOTADR|COUNT|TRLBAR|BANG", minlen: 2, name: "lprevious", parser: "parse_cmd_common"},
277277
{flags: "RANGE|NOTADR|COUNT|TRLBAR|BANG", minlen: 3, name: "lpfile", parser: "parse_cmd_common"},
278278
{flags: "RANGE|NOTADR|COUNT|TRLBAR|BANG", minlen: 2, name: "lrewind", parser: "parse_cmd_common"},
@@ -404,7 +404,7 @@ var builtin_commands = []*Cmd{
404404
{flags: "RANGE|NOTADR|COUNT|TRLBAR", minlen: 3, name: "sbnext", parser: "parse_cmd_common"},
405405
{flags: "RANGE|NOTADR|COUNT|TRLBAR", minlen: 3, name: "sbprevious", parser: "parse_cmd_common"},
406406
{flags: "TRLBAR", minlen: 3, name: "sbrewind", parser: "parse_cmd_common"},
407-
{flags: "TRLBAR|CMDWIN", minlen: 5, name: "scriptnames", parser: "parse_cmd_common"},
407+
{flags: "TRLBAR|CMDWIN", minlen: 3, name: "scriptnames", parser: "parse_cmd_common"},
408408
{flags: "WORD1|TRLBAR|CMDWIN", minlen: 7, name: "scriptencoding", parser: "parse_cmd_common"},
409409
{flags: "EXTRA|NOTRLCOM", minlen: 3, name: "scscope", parser: "parse_cmd_common"},
410410
{flags: "TRLBAR|EXTRA|CMDWIN|SBOXOK", minlen: 2, name: "set", parser: "parse_cmd_common"},
@@ -460,7 +460,7 @@ var builtin_commands = []*Cmd{
460460
{flags: "RANGE|NOTADR|BANG|TRLBAR|ZEROR", minlen: 2, name: "tNext", parser: "parse_cmd_common"},
461461
{flags: "RANGE|NOTADR|COUNT|TRLBAR", minlen: 4, name: "tabNext", parser: "parse_cmd_common"},
462462
{flags: "RANGE|NOTADR|COUNT|BANG|TRLBAR|CMDWIN", minlen: 4, name: "tabclose", parser: "parse_cmd_common"},
463-
{flags: "NEEDARG|EXTRA|NOTRLCOM", minlen: 5, name: "tabdo", parser: "parse_cmd_common"},
463+
{flags: "NEEDARG|EXTRA|NOTRLCOM", minlen: 4, name: "tabdo", parser: "parse_cmd_common"},
464464
{flags: "BANG|FILE1|RANGE|NOTADR|ZEROR|EDITCMD|ARGOPT|TRLBAR", minlen: 4, name: "tabedit", parser: "parse_cmd_common"},
465465
{flags: "BANG|FILE1|RANGE|NOTADR|ZEROR|EDITCMD|ARGOPT|NEEDARG|TRLBAR", minlen: 4, name: "tabfind", parser: "parse_cmd_common"},
466466
{flags: "TRLBAR", minlen: 6, name: "tabfirst", parser: "parse_cmd_common"},

0 commit comments

Comments
 (0)