From c4c5642513ac41b22b7772cc880c776c69e964c9 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 21 Jul 2021 20:38:46 +0200 Subject: [PATCH] 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) --- src/testdir/test_vim9_func.vim | 6 ++++++ src/version.c | 2 ++ src/vim9compile.c | 3 +-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index a2c4e7dae..8ac05d421 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -960,6 +960,12 @@ def Test_call_lambda_args() 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: ', 2) enddef def FilterWithCond(x: string, Cond: func(string): bool): bool diff --git a/src/version.c b/src/version.c index 61cd6f7b2..bc26f903d 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 3195, /**/ 3194, /**/ diff --git a/src/vim9compile.c b/src/vim9compile.c index 701487548..5a39906ef 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -4354,8 +4354,7 @@ compile_subscript( } 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 -- 2.40.0