summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-10-28 14:31:16 +0100
committerBram Moolenaar <Bram@vim.org>2020-10-28 14:31:16 +0100
commit6cf7e3b026727818cd137e2b317b1f6d7c072703 (patch)
treeecbbec3ad64293e7d5ad642c826d1e673e69ab0f
parentb4bcea474d9006e4db1fa5d6828773e739af14bb (diff)
patch 8.2.1915: Vim9: error for wrong number of arguments is not usefulv8.2.1915
Problem: Vim9: error for wrong number of arguments is not useful. Solution: Mention whatever we have for the name. (closes #7208)
-rw-r--r--src/testdir/test_vim9_func.vim4
-rw-r--r--src/version.c2
-rw-r--r--src/vim9compile.c4
3 files changed, 7 insertions, 3 deletions
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index b69001850b..9b10c2bda3 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -322,6 +322,8 @@ def Test_call_wrong_args()
CheckDefFailure(['bufnr(xxx)'], 'E1001:')
CheckScriptFailure(['def Func(Ref: func(s: string))'], 'E475:')
+ CheckDefFailure(['echo {i -> 0}()'], 'E119: Not enough arguments for function: {i -> 0}()')
+
var lines =<< trim END
vim9script
def Func(s: string)
@@ -1551,7 +1553,7 @@ def Test_restore_modifiers()
set eventignore=
autocmd QuickFixCmdPost * copen
def AutocmdsDisabled()
- eval 0
+ eval 0
enddef
func Func()
noautocmd call s:AutocmdsDisabled()
diff --git a/src/version.c b/src/version.c
index ad74098dcb..e2a588c444 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1915,
+/**/
1914,
/**/
1913,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 60b55d5602..225d5d50e6 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1687,12 +1687,12 @@ generate_PCALL(
if (argcount < type->tt_min_argcount - varargs)
{
- semsg(_(e_toofewarg), "[reference]");
+ semsg(_(e_toofewarg), name);
return FAIL;
}
if (!varargs && argcount > type->tt_argcount)
{
- semsg(_(e_toomanyarg), "[reference]");
+ semsg(_(e_toomanyarg), name);
return FAIL;
}
}