Mercurial > vim

changeset 25316:0716cc2e4a8b v8.2.3195

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3195: Vim9: unclear error when passing too many arguments to lambda Commit: https://github.com/vim/vim/commit/c4c5642513ac41b22b7772cc880c776c69e964c9 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jul 21 20:38:46 2021 +0200 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)
author Bram Moolenaar <Bram@vim.org>
date Wed, 21 Jul 2021 20:45:04 +0200
parents cf45fde10bdb
children b2006e12af25
files src/testdir/test_vim9_func.vim src/version.c src/vim9compile.c
diffstat 3 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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: <lambda>', 2)
 enddef
 
 def FilterWithCond(x: string, Cond: func(string): bool): bool
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3195,
+/**/
     3194,
 /**/
     3193,
--- 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