patch 8.2.2726: confusing error message with white space before comma
Problem: Confusing error message with white space before comma in the
arguments of a function declaration.
Solution: Give a specific error message. (closes #2235)
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 8085e5c..730cf40 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -1263,6 +1263,15 @@
CheckScriptFailure(['def Func5(items)', 'echo "a"'], 'E1077:')
enddef
+def Test_white_space_before_comma()
+ var lines =<< trim END
+ vim9script
+ def Func(a: number , b: number)
+ enddef
+ END
+ CheckScriptFailure(lines, 'E1068:')
+enddef
+
def Test_white_space_after_comma()
var lines =<< trim END
vim9script
diff --git a/src/userfunc.c b/src/userfunc.c
index 1139573..af107b0 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -307,6 +307,17 @@
emsg(_("E989: Non-default argument follows default argument"));
goto err_ret;
}
+
+ if (VIM_ISWHITE(*p) && *skipwhite(p) == ',')
+ {
+ // Be tolerant when skipping
+ if (!skip)
+ {
+ semsg(_(e_no_white_space_allowed_before_str_str), ",", p);
+ goto err_ret;
+ }
+ p = skipwhite(p);
+ }
if (*p == ',')
{
++p;
diff --git a/src/version.c b/src/version.c
index 4318b71..9b356bd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2726,
+/**/
2725,
/**/
2724,