thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3895: Vim9: confusing error when using function() with a number

Browse Source 
Problem:    Vim9: confusing error when using function() with a number.
Solution:   Check for a function or string argument.
This commit is contained in:
Bram Moolenaar
2021-12-25 19:43:44 +00:00
parent 223d0a6bc8
commit ae1068afde
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/evalfunc.c
View File

@@ -3998,7 +3998,8 @@ common_function(typval_T *argvars, typval_T *rettv, int is_funcref)
int is_global = FALSE; int is_global = FALSE;
if (in_vim9script() if (in_vim9script()
&& (check_for_opt_list_arg(argvars, 1) == FAIL && (check_for_string_or_func_arg(argvars, 0) == FAIL
|| check_for_opt_list_arg(argvars, 1) == FAIL
|| (argvars[1].v_type != VAR_UNKNOWN || (argvars[1].v_type != VAR_UNKNOWN
&& check_for_opt_dict_arg(argvars, 2) == FAIL))) && check_for_opt_dict_arg(argvars, 2) == FAIL)))
return; return;

2
src/testdir/test_vim9_builtin.vim
View File

@@ -1352,6 +1352,8 @@ def Test_funcref()
enddef enddef
def Test_function() def Test_function()
CheckDefExecAndScriptFailure(['function(123)'], 'E1256: String or function required for argument 1')
CheckDefAndScriptFailure(['function("reverse", 2)'], ['E1013: Argument 2: type mismatch, expected list<any> but got number', 'E1211: List required for argument 2']) CheckDefAndScriptFailure(['function("reverse", 2)'], ['E1013: Argument 2: type mismatch, expected list<any> but got number', 'E1211: List required for argument 2'])
CheckDefAndScriptFailure(['function("reverse", [2], [1])'], ['E1013: Argument 3: type mismatch, expected dict<any> but got list<number>', 'E1206: Dictionary required for argument 3']) CheckDefAndScriptFailure(['function("reverse", [2], [1])'], ['E1013: Argument 3: type mismatch, expected dict<any> but got list<number>', 'E1206: Dictionary required for argument 3'])

2
src/version.c
View File

@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3895,
/**/ /**/
3894, 3894,
/**/ /**/