patch 8.2.2405: Vim9: no need to allow white space before "(" for :def
Problem: Vim9: no need to allow white space before "(" for :def.
Solution: Give an error for stray white space. (issue #7734)
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index fc1ed21..a5855ad 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -116,6 +116,38 @@
CheckScriptFailure(lines, 'E126:', 2)
enddef
+def Test_white_space_before_paren()
+ var lines =<< trim END
+ vim9script
+ def Test ()
+ echo 'test'
+ enddef
+ END
+ CheckScriptFailure(lines, 'E1068:', 2)
+
+ lines =<< trim END
+ vim9script
+ func Test ()
+ echo 'test'
+ endfunc
+ END
+ CheckScriptFailure(lines, 'E1068:', 2)
+
+ lines =<< trim END
+ def Test ()
+ echo 'test'
+ enddef
+ END
+ CheckScriptFailure(lines, 'E1068:', 1)
+
+ lines =<< trim END
+ func Test ()
+ echo 'test'
+ endfunc
+ END
+ CheckScriptSuccess(lines)
+enddef
+
def Test_enddef_dict_key()
var d = {
enddef: 'x',
diff --git a/src/userfunc.c b/src/userfunc.c
index 9216685..0f28b02 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3199,6 +3199,12 @@
p = vim_strchr(p, '(');
}
+ if ((vim9script || eap->cmdidx == CMD_def) && VIM_ISWHITE(p[-1]))
+ {
+ semsg(_(e_no_white_space_allowed_before_str), "(");
+ goto ret_free;
+ }
+
// In Vim9 script only global functions can be redefined.
if (vim9script && eap->forceit && !is_global)
{
diff --git a/src/version.c b/src/version.c
index 43ad049..136448a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2405,
+/**/
2404,
/**/
2403,