patch 8.2.2256: Vim9: cannot use function( after line break in :def function
Problem: Vim9: cannot use function( after line break in :def function.
Solution: Check for "(" after "function". (closes #7581)
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index bdced02..d0d4e3b 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -260,6 +260,11 @@
CheckScriptSuccess(lines)
enddef
+def Test_not_nested_function()
+ echo printf('%d',
+ function('len')('xxx'))
+enddef
+
func Test_call_default_args_from_func()
call MyDefaultArgs()->assert_equal('string')
call MyDefaultArgs('one')->assert_equal('one')
diff --git a/src/userfunc.c b/src/userfunc.c
index a70870b..bc3dd0e 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -2925,6 +2925,27 @@
}
/*
+ * Check if "*cmd" points to a function command and if so advance "*cmd" and
+ * return TRUE.
+ * Otherwise return FALSE;
+ * Do not consider "function(" to be a command.
+ */
+ static int
+is_function_cmd(char_u **cmd)
+{
+ char_u *p = *cmd;
+
+ if (checkforcmd(&p, "function", 2))
+ {
+ if (*p == '(')
+ return FALSE;
+ *cmd = p;
+ return TRUE;
+ }
+ return FALSE;
+}
+
+/*
* ":function" also supporting nested ":def".
* When "name_arg" is not NULL this is a nested function, using "name_arg" for
* the function name.
@@ -3426,7 +3447,7 @@
// Only recognize "def" inside "def", not inside "function",
// For backwards compatibility, see Test_function_python().
c = *p;
- if (checkforcmd(&p, "function", 2)
+ if (is_function_cmd(&p)
|| (eap->cmdidx == CMD_def && checkforcmd(&p, "def", 3)))
{
if (*p == '!')
diff --git a/src/version.c b/src/version.c
index 0ef6918..75813ed 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2256,
+/**/
2255,
/**/
2254,