patch 8.2.3195: Vim9: unclear error when passing too many arguments to lambda
Problem: Vim9: unclear error when passing too many arguments to lambda.
Solution: Pass the expression itself instead of "[expression]".
(closes #8604)
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index a2c4e7d..8ac05d4 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -960,6 +960,12 @@
echo ((a) => a)('aa', 'bb')
END
CheckDefAndScriptFailure(lines, 'E118:', 1)
+
+ lines =<< trim END
+ echo 'aa'->((a) => a)('bb')
+ END
+ CheckDefFailure(lines, 'E118: Too many arguments for function: ->((a) => a)(''bb'')', 1)
+ CheckScriptFailure(['vim9script'] + lines, 'E118: Too many arguments for function: <lambda>', 2)
enddef
def FilterWithCond(x: string, Cond: func(string): bool): bool
diff --git a/src/version.c b/src/version.c
index 61cd6f7..bc26f90 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3195,
+/**/
3194,
/**/
3193,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 7014875..5a39906 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -4354,8 +4354,7 @@
}
type = ((type_T **)stack->ga_data)[stack->ga_len - 1];
- if (generate_PCALL(cctx, argcount,
- (char_u *)"[expression]", type, FALSE) == FAIL)
+ if (generate_PCALL(cctx, argcount, p - 2, type, FALSE) == FAIL)
return FAIL;
}
else