Skip to content

Commit ce3c2f1

Browse files
authored
Merge pull request #38 from haya14busa/update-vimlparser
update vimlparser
2 parents 8ab737d + eaef3d5 commit ce3c2f1

File tree

2 files changed

+25
-10
lines changed

2 files changed

+25
-10
lines changed

autoload/vimlparser.vim

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function! vimlparser#test(input, ...)
1818
else
1919
let l:neovim = 0
2020
endif
21-
let i = type(a:input) == 1 && filereadable(a:input) ? readfile(a:input) : a:input
21+
let i = type(a:input) == 1 && filereadable(a:input) ? readfile(a:input) : [a:input]
2222
let r = s:StringReader.new(i)
2323
let p = s:VimLParser.new(l:neovim)
2424
let c = s:Compiler.new()
@@ -569,6 +569,8 @@ function! s:VimLParser.parse_command_modifiers()
569569
call add(modifiers, {'name': 'leftabove'})
570570
elseif stridx('noautocmd', k) == 0 && len(k) >= 3 " noa\%[utocmd]
571571
call add(modifiers, {'name': 'noautocmd'})
572+
elseif stridx('noswapfile', k) == 0 && len(k) >= 3 " :nos\%[wapfile]
573+
call add(modifiers, {'name': 'noswapfile'})
572574
elseif stridx('rightbelow', k) == 0 && len(k) >= 6 "rightb\%[elow]
573575
call add(modifiers, {'name': 'rightbelow'})
574576
elseif stridx('sandbox', k) == 0 && len(k) >= 3 " san\%[dbox]
@@ -1963,17 +1965,21 @@ function! s:VimLParser.parse_cmd_syntax()
19631965
endfunction
19641966

19651967
let s:VimLParser.neovim_additional_commands = [
1966-
\ {'name': 'tnoremap', 'minlen': 8, 'flags': 'EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN', 'parser': 'parse_cmd_common'}]
1968+
\ {'name': 'tnoremap', 'minlen': 8, 'flags': 'EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN', 'parser': 'parse_cmd_common'},
1969+
\ {'name': 'rshada', 'minlen': 3, 'flags': 'BANG|FILE1|TRLBAR|CMDWIN', 'parser': 'parse_cmd_common'},
1970+
\ {'name': 'wshada', 'minlen': 3, 'flags': 'BANG|FILE1|TRLBAR|CMDWIN', 'parser': 'parse_cmd_common'}]
19671971

19681972
let s:VimLParser.neovim_removed_commands = [
1969-
\ {"name":"Print", "minlen":1, "flags":"RANGE|WHOLEFOLD|COUNT|EXFLAGS|TRLBAR|CMDWIN", "parser":"parse_cmd_common"},
1970-
\ {"name":"fixdel", "minlen":3, "flags":"TRLBAR|CMDWIN", "parser":"parse_cmd_common"},
1971-
\ {"name":"helpfind", "minlen":5, "flags":"EXTRA|NOTRLCOM", "parser":"parse_cmd_common"},
1972-
\ {"name":"open", "minlen":1, "flags":"RANGE|BANG|EXTRA", "parser":"parse_cmd_common"},
1973-
\ {"name":"shell", "minlen":2, "flags":"TRLBAR|CMDWIN", "parser":"parse_cmd_common"},
1974-
\ {"name":"tearoff", "minlen":2, "flags":"NEEDARG|EXTRA|TRLBAR|NOTRLCOM|CMDWIN", "parser":"parse_cmd_common"},
1975-
\ {"name":"gvim", "minlen":2, "flags":"BANG|FILES|EDITCMD|ARGOPT|TRLBAR|CMDWIN", "parser":"parse_cmd_common"}]
1976-
1973+
\ {'name': 'Print', 'minlen':1, 'flags': 'RANGE|WHOLEFOLD|COUNT|EXFLAGS|TRLBAR|CMDWIN', 'parser': 'parse_cmd_common'},
1974+
\ {'name': 'fixdel', 'minlen':3, 'flags': 'TRLBAR|CMDWIN', 'parser': 'parse_cmd_common'},
1975+
\ {'name': 'helpfind', 'minlen':5, 'flags': 'EXTRA|NOTRLCOM', 'parser': 'parse_cmd_common'},
1976+
\ {'name': 'open', 'minlen':1, 'flags': 'RANGE|BANG|EXTRA', 'parser': 'parse_cmd_common'},
1977+
\ {'name': 'shell', 'minlen':2, 'flags': 'TRLBAR|CMDWIN', 'parser': 'parse_cmd_common'},
1978+
\ {'name': 'tearoff', 'minlen':2, 'flags': 'NEEDARG|EXTRA|TRLBAR|NOTRLCOM|CMDWIN', 'parser': 'parse_cmd_common'},
1979+
\ {'name': 'gvim', 'minlen':2, 'flags': 'BANG|FILES|EDITCMD|ARGOPT|TRLBAR|CMDWIN', 'parser': 'parse_cmd_common'}]
1980+
1981+
" To find new builtin_commands, run the below script.
1982+
" $ scripts/update_builtin_commands.sh /path/to/vim/src/ex_cmds.h
19771983
let s:VimLParser.builtin_commands = [
19781984
\ {'name': 'append', 'minlen': 1, 'flags': 'BANG|RANGE|ZEROR|TRLBAR|CMDWIN|MODIFY', 'parser': 'parse_cmd_append'},
19791985
\ {'name': 'abbreviate', 'minlen': 2, 'flags': 'EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN', 'parser': 'parse_cmd_common'},
@@ -2513,6 +2519,10 @@ let s:VimLParser.builtin_commands = [
25132519
\ {'flags': 'BANG|FILE1|NEEDARG|TRLBAR|SBOXOK|CMDWIN', 'minlen': 2, 'name': 'packadd', 'parser': 'parse_cmd_common'},
25142520
\ {'flags': 'BANG|TRLBAR|SBOXOK|CMDWIN', 'minlen': 5, 'name': 'packloadall', 'parser': 'parse_cmd_common'},
25152521
\ {'flags': 'TRLBAR|CMDWIN|SBOXOK', 'minlen': 3, 'name': 'smile', 'parser': 'parse_cmd_common'},
2522+
\ {'flags': 'RANGE|EXTRA|NEEDARG|CMDWIN', 'minlen': 3, 'name': 'pyx', 'parser': 'parse_cmd_common'},
2523+
\ {'flags': 'RANGE|DFLALL|EXTRA|NEEDARG|CMDWIN', 'minlen': 4, 'name': 'pyxdo', 'parser': 'parse_cmd_common'},
2524+
\ {'flags': 'RANGE|EXTRA|NEEDARG|CMDWIN', 'minlen': 7, 'name': 'pythonx', 'parser': 'parse_cmd_common'},
2525+
\ {'flags': 'RANGE|FILE1|NEEDARG|CMDWIN', 'minlen': 4, 'name': 'pyxfile', 'parser': 'parse_cmd_common'},
25162526
\]
25172527

25182528
let s:ExprTokenizer = {}

go/vimlparser.go

Lines changed: 5 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)