changeset 26733:3aa38eaa5a11 v8.2.3895

patch 8.2.3895: Vim9: confusing error when using function() with a number Commit: https://github.com/vim/vim/commit/ae1068afde6dfc6fd3e3f54512dbd089e1559053 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Dec 25 19:43:44 2021 +0000 patch 8.2.3895: Vim9: confusing error when using function() with a number Problem: Vim9: confusing error when using function() with a number. Solution: Check for a function or string argument.
author Bram Moolenaar <Bram@vim.org>
date Sat, 25 Dec 2021 20:45:02 +0100
parents bf95026c4399
children f5c8c084a576
files src/evalfunc.c src/testdir/test_vim9_builtin.vim src/version.c
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -3998,7 +3998,8 @@ common_function(typval_T *argvars, typva
     int		is_global = FALSE;
 
     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
 		    && check_for_opt_dict_arg(argvars, 2) == FAIL)))
 	return;
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -1352,6 +1352,8 @@ def Test_funcref()
 enddef
 
 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], [1])'], ['E1013: Argument 3: type mismatch, expected dict<any> but got list<number>', 'E1206: Dictionary required for argument 3'])
 
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3895,
+/**/
     3894,
 /**/
     3893,