Skip to content

Commit bf4bf54

Browse files
authored
Merge pull request #193 from vim-jp/update-func-cmds
update builtin functions and commands
2 parents e6edd84 + a39ffb3 commit bf4bf54

File tree

3 files changed

+57
-4
lines changed

3 files changed

+57
-4
lines changed

autoload/vimlparser.vim

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2288,6 +2288,7 @@ let s:VimLParser.builtin_commands = [
22882288
\ {'name': 'debug', 'minlen': 3, 'flags': 'NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
22892289
\ {'name': 'debuggreedy', 'minlen': 6, 'flags': 'RANGE|ZEROR|TRLBAR|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
22902290
\ {'name': 'def', 'minlen': 3, 'flags': 'EXTRA|BANG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
2291+
\ {'name': 'defer', 'minlen': 4, 'flags': 'NEEDARG|EXTRA|NOTRLCOM|EXPR_ARG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
22912292
\ {'name': 'defcompile', 'minlen': 4, 'flags': 'SBOXOK|CMDWIN|LOCK_OK|TRLBAR', 'parser': 'parse_cmd_common'},
22922293
\ {'name': 'delcommand', 'minlen': 4, 'flags': 'NEEDARG|WORD1|TRLBAR|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
22932294
\ {'name': 'delfunction', 'minlen': 4, 'flags': 'BANG|NEEDARG|WORD1|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_delfunction'},
@@ -2315,6 +2316,7 @@ let s:VimLParser.builtin_commands = [
23152316
\ {'name': 'echohl', 'minlen': 5, 'flags': 'EXTRA|TRLBAR|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_echohl'},
23162317
\ {'name': 'echomsg', 'minlen': 5, 'flags': 'EXTRA|NOTRLCOM|EXPR_ARG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_echomsg'},
23172318
\ {'name': 'echoconsole', 'minlen': 5, 'flags': 'EXTRA|NOTRLCOM|EXPR_ARG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_echoconsole'},
2319+
\ {'name': 'echowindow', 'minlen': 5, 'flags': 'EXTRA|NOTRLCOM|EXPR_ARG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
23182320
\ {'name': 'echon', 'minlen': 5, 'flags': 'EXTRA|NOTRLCOM|EXPR_ARG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_echon'},
23192321
\ {'name': 'else', 'minlen': 2, 'flags': 'TRLBAR|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_else'},
23202322
\ {'name': 'elseif', 'minlen': 5, 'flags': 'EXTRA|NOTRLCOM|EXPR_ARG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_elseif'},
@@ -2368,6 +2370,7 @@ let s:VimLParser.builtin_commands = [
23682370
\ {'name': 'highlight', 'minlen': 2, 'flags': 'BANG|EXTRA|TRLBAR|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
23692371
\ {'name': 'hide', 'minlen': 3, 'flags': 'BANG|RANGE|COUNT|EXTRA|TRLBAR', 'parser': 'parse_cmd_common'},
23702372
\ {'name': 'history', 'minlen': 3, 'flags': 'EXTRA|TRLBAR|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
2373+
\ {'name': 'horizontal', 'minlen': 2, 'flags': 'NEEDARG|EXTRA|NOTRLCOM', 'parser': 'parse_cmd_common'},
23712374
\ {'name': 'insert', 'minlen': 1, 'flags': 'BANG|RANGE|TRLBAR|CMDWIN|LOCK_OK|MODIFY', 'parser': 'parse_cmd_insert'},
23722375
\ {'name': 'iabbrev', 'minlen': 2, 'flags': 'EXTRA|TRLBAR|NOTRLCOM|CTRLV|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
23732376
\ {'name': 'iabclear', 'minlen': 4, 'flags': 'EXTRA|TRLBAR|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
@@ -2791,6 +2794,9 @@ let s:VimLParser.builtin_functions = [
27912794
\ {'name': 'assert_true', 'min_argc': 1, 'max_argc': 2, 'argtype': 'FEARG_1'},
27922795
\ {'name': 'atan', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
27932796
\ {'name': 'atan2', 'min_argc': 2, 'max_argc': 2, 'argtype': 'FEARG_1'},
2797+
\ {'name': 'autocmd_add', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
2798+
\ {'name': 'autocmd_delete', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
2799+
\ {'name': 'autocmd_get', 'min_argc': 0, 'max_argc': 1, 'argtype': 'FEARG_1'},
27942800
\ {'name': 'balloon_gettext', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
27952801
\ {'name': 'balloon_show', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
27962802
\ {'name': 'balloon_split', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
@@ -2913,8 +2919,10 @@ let s:VimLParser.builtin_functions = [
29132919
\ {'name': 'getcharpos', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
29142920
\ {'name': 'getcharsearch', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
29152921
\ {'name': 'getcharstr', 'min_argc': 0, 'max_argc': 1, 'argtype': '0'},
2922+
\ {'name': 'getcmdcompltype', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
29162923
\ {'name': 'getcmdline', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
29172924
\ {'name': 'getcmdpos', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
2925+
\ {'name': 'getcmdscreenpos', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
29182926
\ {'name': 'getcmdtype', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
29192927
\ {'name': 'getcmdwintype', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
29202928
\ {'name': 'getcompletion', 'min_argc': 2, 'max_argc': 3, 'argtype': 'FEARG_1'},
@@ -2940,6 +2948,7 @@ let s:VimLParser.builtin_functions = [
29402948
\ {'name': 'getreg', 'min_argc': 0, 'max_argc': 3, 'argtype': 'FEARG_1'},
29412949
\ {'name': 'getreginfo', 'min_argc': 0, 'max_argc': 1, 'argtype': 'FEARG_1'},
29422950
\ {'name': 'getregtype', 'min_argc': 0, 'max_argc': 1, 'argtype': 'FEARG_1'},
2951+
\ {'name': 'getscriptinfo', 'min_argc': 0, 'max_argc': 1, 'argtype': '0'},
29432952
\ {'name': 'gettabinfo', 'min_argc': 0, 'max_argc': 1, 'argtype': 'FEARG_1'},
29442953
\ {'name': 'gettabvar', 'min_argc': 2, 'max_argc': 3, 'argtype': 'FEARG_1'},
29452954
\ {'name': 'gettabwinvar', 'min_argc': 3, 'max_argc': 4, 'argtype': 'FEARG_1'},
@@ -2971,6 +2980,7 @@ let s:VimLParser.builtin_functions = [
29712980
\ {'name': 'iconv', 'min_argc': 3, 'max_argc': 3, 'argtype': 'FEARG_1'},
29722981
\ {'name': 'indent', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
29732982
\ {'name': 'index', 'min_argc': 2, 'max_argc': 4, 'argtype': 'FEARG_1'},
2983+
\ {'name': 'indexof', 'min_argc': 2, 'max_argc': 3, 'argtype': 'FEARG_1'},
29742984
\ {'name': 'input', 'min_argc': 1, 'max_argc': 3, 'argtype': 'FEARG_1'},
29752985
\ {'name': 'inputdialog', 'min_argc': 1, 'max_argc': 3, 'argtype': 'FEARG_1'},
29762986
\ {'name': 'inputlist', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
@@ -2980,6 +2990,7 @@ let s:VimLParser.builtin_functions = [
29802990
\ {'name': 'insert', 'min_argc': 2, 'max_argc': 3, 'argtype': 'FEARG_1'},
29812991
\ {'name': 'interrupt', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
29822992
\ {'name': 'invert', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
2993+
\ {'name': 'isabsolutepath', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
29832994
\ {'name': 'isdirectory', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
29842995
\ {'name': 'isinf', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
29852996
\ {'name': 'islocked', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
@@ -3016,6 +3027,7 @@ let s:VimLParser.builtin_functions = [
30163027
\ {'name': 'map', 'min_argc': 2, 'max_argc': 2, 'argtype': 'FEARG_1'},
30173028
\ {'name': 'maparg', 'min_argc': 1, 'max_argc': 4, 'argtype': 'FEARG_1'},
30183029
\ {'name': 'mapcheck', 'min_argc': 1, 'max_argc': 3, 'argtype': 'FEARG_1'},
3030+
\ {'name': 'maplist', 'min_argc': 0, 'max_argc': 1, 'argtype': '0'},
30193031
\ {'name': 'mapnew', 'min_argc': 2, 'max_argc': 2, 'argtype': 'FEARG_1'},
30203032
\ {'name': 'mapset', 'min_argc': 3, 'max_argc': 3, 'argtype': 'FEARG_1'},
30213033
\ {'name': 'match', 'min_argc': 2, 'max_argc': 4, 'argtype': 'FEARG_1'},
@@ -3129,6 +3141,7 @@ let s:VimLParser.builtin_functions = [
31293141
\ {'name': 'setcellwidths', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
31303142
\ {'name': 'setcharpos', 'min_argc': 2, 'max_argc': 2, 'argtype': 'FEARG_2'},
31313143
\ {'name': 'setcharsearch', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
3144+
\ {'name': 'setcmdline', 'min_argc': 1, 'max_argc': 2, 'argtype': 'FEARG_1'},
31323145
\ {'name': 'setcmdpos', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
31333146
\ {'name': 'setcursorcharpos', 'min_argc': 1, 'max_argc': 3, 'argtype': 'FEARG_1'},
31343147
\ {'name': 'setenv', 'min_argc': 2, 'max_argc': 2, 'argtype': 'FEARG_2'},
@@ -3239,6 +3252,7 @@ let s:VimLParser.builtin_functions = [
32393252
\ {'name': 'test_garbagecollect_soon', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
32403253
\ {'name': 'test_getvalue', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
32413254
\ {'name': 'test_gui_drop_files', 'min_argc': 4, 'max_argc': 4, 'argtype': '0'},
3255+
\ {'name': 'test_gui_event', 'min_argc': 2, 'max_argc': 2, 'argtype': 'FEARG_1'},
32423256
\ {'name': 'test_gui_mouse_event', 'min_argc': 5, 'max_argc': 5, 'argtype': '0'},
32433257
\ {'name': 'test_ignore_error', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
32443258
\ {'name': 'test_null_blob', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
@@ -3275,6 +3289,7 @@ let s:VimLParser.builtin_functions = [
32753289
\ {'name': 'uniq', 'min_argc': 1, 'max_argc': 3, 'argtype': 'FEARG_1'},
32763290
\ {'name': 'values', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
32773291
\ {'name': 'virtcol', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
3292+
\ {'name': 'virtcol2col', 'min_argc': 3, 'max_argc': 3, 'argtype': 'FEARG_1'},
32783293
\ {'name': 'visualmode', 'min_argc': 0, 'max_argc': 1, 'argtype': '0'},
32793294
\ {'name': 'wildmenumode', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
32803295
\ {'name': 'win_execute', 'min_argc': 2, 'max_argc': 3, 'argtype': 'FEARG_2'},

js/vimlparser.js

Lines changed: 23 additions & 2 deletions
Large diffs are not rendered by default.

py/vimlparser.py

Lines changed: 19 additions & 2 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)