Skip to content

Commit afee7b1

Browse files
lehmacdjlehmacdj
committed
Merge remote-tracking branch 'origin/master'
2 parents 057654b + 71b3b3f commit afee7b1

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

Diff for: ‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
*.out
2+
py/__pycache__/

Diff for: ‎autoload/vimlparser.vim

+15
Original file line numberDiff line numberDiff line change
@@ -2317,6 +2317,7 @@ let s:VimLParser.builtin_commands = [
23172317
\ {'name': 'debug', 'minlen': 3, 'flags': 'NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
23182318
\ {'name': 'debuggreedy', 'minlen': 6, 'flags': 'RANGE|ZEROR|TRLBAR|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
23192319
\ {'name': 'def', 'minlen': 3, 'flags': 'EXTRA|BANG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
2320+
\ {'name': 'defer', 'minlen': 4, 'flags': 'NEEDARG|EXTRA|NOTRLCOM|EXPR_ARG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
23202321
\ {'name': 'defcompile', 'minlen': 4, 'flags': 'SBOXOK|CMDWIN|LOCK_OK|TRLBAR', 'parser': 'parse_cmd_common'},
23212322
\ {'name': 'delcommand', 'minlen': 4, 'flags': 'NEEDARG|WORD1|TRLBAR|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
23222323
\ {'name': 'delfunction', 'minlen': 4, 'flags': 'BANG|NEEDARG|WORD1|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_delfunction'},
@@ -2344,6 +2345,7 @@ let s:VimLParser.builtin_commands = [
23442345
\ {'name': 'echohl', 'minlen': 5, 'flags': 'EXTRA|TRLBAR|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_echohl'},
23452346
\ {'name': 'echomsg', 'minlen': 5, 'flags': 'EXTRA|NOTRLCOM|EXPR_ARG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_echomsg'},
23462347
\ {'name': 'echoconsole', 'minlen': 5, 'flags': 'EXTRA|NOTRLCOM|EXPR_ARG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_echoconsole'},
2348+
\ {'name': 'echowindow', 'minlen': 5, 'flags': 'EXTRA|NOTRLCOM|EXPR_ARG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
23472349
\ {'name': 'echon', 'minlen': 5, 'flags': 'EXTRA|NOTRLCOM|EXPR_ARG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_echon'},
23482350
\ {'name': 'else', 'minlen': 2, 'flags': 'TRLBAR|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_else'},
23492351
\ {'name': 'elseif', 'minlen': 5, 'flags': 'EXTRA|NOTRLCOM|EXPR_ARG|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_elseif'},
@@ -2397,6 +2399,7 @@ let s:VimLParser.builtin_commands = [
23972399
\ {'name': 'highlight', 'minlen': 2, 'flags': 'BANG|EXTRA|TRLBAR|SBOXOK|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
23982400
\ {'name': 'hide', 'minlen': 3, 'flags': 'BANG|RANGE|COUNT|EXTRA|TRLBAR', 'parser': 'parse_cmd_common'},
23992401
\ {'name': 'history', 'minlen': 3, 'flags': 'EXTRA|TRLBAR|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
2402+
\ {'name': 'horizontal', 'minlen': 2, 'flags': 'NEEDARG|EXTRA|NOTRLCOM', 'parser': 'parse_cmd_common'},
24002403
\ {'name': 'insert', 'minlen': 1, 'flags': 'BANG|RANGE|TRLBAR|CMDWIN|LOCK_OK|MODIFY', 'parser': 'parse_cmd_insert'},
24012404
\ {'name': 'iabbrev', 'minlen': 2, 'flags': 'EXTRA|TRLBAR|NOTRLCOM|CTRLV|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
24022405
\ {'name': 'iabclear', 'minlen': 4, 'flags': 'EXTRA|TRLBAR|CMDWIN|LOCK_OK', 'parser': 'parse_cmd_common'},
@@ -2820,6 +2823,9 @@ let s:VimLParser.builtin_functions = [
28202823
\ {'name': 'assert_true', 'min_argc': 1, 'max_argc': 2, 'argtype': 'FEARG_1'},
28212824
\ {'name': 'atan', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
28222825
\ {'name': 'atan2', 'min_argc': 2, 'max_argc': 2, 'argtype': 'FEARG_1'},
2826+
\ {'name': 'autocmd_add', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
2827+
\ {'name': 'autocmd_delete', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
2828+
\ {'name': 'autocmd_get', 'min_argc': 0, 'max_argc': 1, 'argtype': 'FEARG_1'},
28232829
\ {'name': 'balloon_gettext', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
28242830
\ {'name': 'balloon_show', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
28252831
\ {'name': 'balloon_split', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
@@ -2942,8 +2948,10 @@ let s:VimLParser.builtin_functions = [
29422948
\ {'name': 'getcharpos', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
29432949
\ {'name': 'getcharsearch', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
29442950
\ {'name': 'getcharstr', 'min_argc': 0, 'max_argc': 1, 'argtype': '0'},
2951+
\ {'name': 'getcmdcompltype', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
29452952
\ {'name': 'getcmdline', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
29462953
\ {'name': 'getcmdpos', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
2954+
\ {'name': 'getcmdscreenpos', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
29472955
\ {'name': 'getcmdtype', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
29482956
\ {'name': 'getcmdwintype', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
29492957
\ {'name': 'getcompletion', 'min_argc': 2, 'max_argc': 3, 'argtype': 'FEARG_1'},
@@ -2969,6 +2977,7 @@ let s:VimLParser.builtin_functions = [
29692977
\ {'name': 'getreg', 'min_argc': 0, 'max_argc': 3, 'argtype': 'FEARG_1'},
29702978
\ {'name': 'getreginfo', 'min_argc': 0, 'max_argc': 1, 'argtype': 'FEARG_1'},
29712979
\ {'name': 'getregtype', 'min_argc': 0, 'max_argc': 1, 'argtype': 'FEARG_1'},
2980+
\ {'name': 'getscriptinfo', 'min_argc': 0, 'max_argc': 1, 'argtype': '0'},
29722981
\ {'name': 'gettabinfo', 'min_argc': 0, 'max_argc': 1, 'argtype': 'FEARG_1'},
29732982
\ {'name': 'gettabvar', 'min_argc': 2, 'max_argc': 3, 'argtype': 'FEARG_1'},
29742983
\ {'name': 'gettabwinvar', 'min_argc': 3, 'max_argc': 4, 'argtype': 'FEARG_1'},
@@ -3000,6 +3009,7 @@ let s:VimLParser.builtin_functions = [
30003009
\ {'name': 'iconv', 'min_argc': 3, 'max_argc': 3, 'argtype': 'FEARG_1'},
30013010
\ {'name': 'indent', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
30023011
\ {'name': 'index', 'min_argc': 2, 'max_argc': 4, 'argtype': 'FEARG_1'},
3012+
\ {'name': 'indexof', 'min_argc': 2, 'max_argc': 3, 'argtype': 'FEARG_1'},
30033013
\ {'name': 'input', 'min_argc': 1, 'max_argc': 3, 'argtype': 'FEARG_1'},
30043014
\ {'name': 'inputdialog', 'min_argc': 1, 'max_argc': 3, 'argtype': 'FEARG_1'},
30053015
\ {'name': 'inputlist', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
@@ -3009,6 +3019,7 @@ let s:VimLParser.builtin_functions = [
30093019
\ {'name': 'insert', 'min_argc': 2, 'max_argc': 3, 'argtype': 'FEARG_1'},
30103020
\ {'name': 'interrupt', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
30113021
\ {'name': 'invert', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
3022+
\ {'name': 'isabsolutepath', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
30123023
\ {'name': 'isdirectory', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
30133024
\ {'name': 'isinf', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
30143025
\ {'name': 'islocked', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
@@ -3045,6 +3056,7 @@ let s:VimLParser.builtin_functions = [
30453056
\ {'name': 'map', 'min_argc': 2, 'max_argc': 2, 'argtype': 'FEARG_1'},
30463057
\ {'name': 'maparg', 'min_argc': 1, 'max_argc': 4, 'argtype': 'FEARG_1'},
30473058
\ {'name': 'mapcheck', 'min_argc': 1, 'max_argc': 3, 'argtype': 'FEARG_1'},
3059+
\ {'name': 'maplist', 'min_argc': 0, 'max_argc': 1, 'argtype': '0'},
30483060
\ {'name': 'mapnew', 'min_argc': 2, 'max_argc': 2, 'argtype': 'FEARG_1'},
30493061
\ {'name': 'mapset', 'min_argc': 3, 'max_argc': 3, 'argtype': 'FEARG_1'},
30503062
\ {'name': 'match', 'min_argc': 2, 'max_argc': 4, 'argtype': 'FEARG_1'},
@@ -3158,6 +3170,7 @@ let s:VimLParser.builtin_functions = [
31583170
\ {'name': 'setcellwidths', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
31593171
\ {'name': 'setcharpos', 'min_argc': 2, 'max_argc': 2, 'argtype': 'FEARG_2'},
31603172
\ {'name': 'setcharsearch', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
3173+
\ {'name': 'setcmdline', 'min_argc': 1, 'max_argc': 2, 'argtype': 'FEARG_1'},
31613174
\ {'name': 'setcmdpos', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
31623175
\ {'name': 'setcursorcharpos', 'min_argc': 1, 'max_argc': 3, 'argtype': 'FEARG_1'},
31633176
\ {'name': 'setenv', 'min_argc': 2, 'max_argc': 2, 'argtype': 'FEARG_2'},
@@ -3268,6 +3281,7 @@ let s:VimLParser.builtin_functions = [
32683281
\ {'name': 'test_garbagecollect_soon', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
32693282
\ {'name': 'test_getvalue', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
32703283
\ {'name': 'test_gui_drop_files', 'min_argc': 4, 'max_argc': 4, 'argtype': '0'},
3284+
\ {'name': 'test_gui_event', 'min_argc': 2, 'max_argc': 2, 'argtype': 'FEARG_1'},
32713285
\ {'name': 'test_gui_mouse_event', 'min_argc': 5, 'max_argc': 5, 'argtype': '0'},
32723286
\ {'name': 'test_ignore_error', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
32733287
\ {'name': 'test_null_blob', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
@@ -3304,6 +3318,7 @@ let s:VimLParser.builtin_functions = [
33043318
\ {'name': 'uniq', 'min_argc': 1, 'max_argc': 3, 'argtype': 'FEARG_1'},
33053319
\ {'name': 'values', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
33063320
\ {'name': 'virtcol', 'min_argc': 1, 'max_argc': 1, 'argtype': 'FEARG_1'},
3321+
\ {'name': 'virtcol2col', 'min_argc': 3, 'max_argc': 3, 'argtype': 'FEARG_1'},
33073322
\ {'name': 'visualmode', 'min_argc': 0, 'max_argc': 1, 'argtype': '0'},
33083323
\ {'name': 'wildmenumode', 'min_argc': 0, 'max_argc': 0, 'argtype': '0'},
33093324
\ {'name': 'win_execute', 'min_argc': 2, 'max_argc': 3, 'argtype': 'FEARG_2'},

Diff for: ‎js/vimlparser.js

+2-2
Large diffs are not rendered by default.

Diff for: ‎py/vimlparser.py

+2-2
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)