diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-12-31 18:28:18 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-12-31 18:28:18 +0100 |
| commit | adc8e4464563a2952c10362d396bb4a9f28cd12d (patch) | |
| tree | ebc1d9b8540d137948274a4c20a1dceb8dfafdfa | |
| parent | 1779ff48427931736998a6e5621b5cbe4d99c3e3 (diff) | |
patch 8.2.2256: Vim9: cannot use function( after line break in :def functionv8.2.2256
Problem: Vim9: cannot use function( after line break in :def function.
Solution: Check for "(" after "function". (closes #7581)
| -rw-r--r-- | src/testdir/test_vim9_func.vim | 5 | ||||
| -rw-r--r-- | src/userfunc.c | 23 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 29 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index bdced0257b..d0d4e3bb01 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -260,6 +260,11 @@ def Test_nested_function() 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 a70870baae..bc3dd0e9ae 100644 --- a/src/userfunc.c +++ b/src/userfunc.c @@ -2925,6 +2925,27 @@ list_functions(regmatch_T *regmatch) } /* + * 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 @@ define_function(exarg_T *eap, char_u *name_arg) // 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 0ef6918bdd..75813ed363 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 */ /**/ + 2256, +/**/ 2255, /**/ 2254, |