diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-08-10 22:40:56 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-08-10 22:40:56 +0200 |
| commit | 8294d49937b99067522fda8a9399bb9533e3c44e (patch) | |
| tree | e6906f5a4aff701e09a2d6d0c7692c7c15ecaabb | |
| parent | efb6482949580ab89e6d7c5e1cb8d744ddd6ef80 (diff) | |
patch 8.2.1418: Vim9: invalid error for missing white spacev8.2.1418
Problem: Vim9: invalid error for missing white space after function.
Solution: Do not skip over white space. (closes #6679)
| -rw-r--r-- | src/testdir/test_vim9_expr.vim | 8 | ||||
| -rw-r--r-- | src/userfunc.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim index d2d2e0b1eb..f831b5abe5 100644 --- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -706,7 +706,7 @@ def RetVoid() let x = 1 enddef -def Test_expr4_vimscript() +def Test_expr4_vim9script() # check line continuation let lines =<< trim END vim9script @@ -819,6 +819,12 @@ def Test_expr4_vimscript() echo 2!= 3 END CheckScriptFailure(lines, 'E1004:') + + lines =<< trim END + vim9script + echo len('xxx') == 3 + END + CheckScriptSuccess(lines) enddef func Test_expr4_fails() diff --git a/src/userfunc.c b/src/userfunc.c index 7d3039a459..f38c978f4e 100644 --- a/src/userfunc.c +++ b/src/userfunc.c @@ -686,7 +686,10 @@ get_func_tv( while (--argcount >= 0) clear_tv(&argvars[argcount]); - *arg = skipwhite(argp); + if (in_vim9script()) + *arg = argp; + else + *arg = skipwhite(argp); return ret; } @@ -4097,6 +4100,7 @@ ex_call(exarg_T *eap) if (!failed || eap->cstack->cs_trylevel > 0) { // Check for trailing illegal characters and a following command. + arg = skipwhite(arg); if (!ends_excmd2(eap->arg, arg)) { if (!failed) diff --git a/src/version.c b/src/version.c index 662a17cfa6..bfd5070c4b 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1418, +/**/ 1417, /**/ 1416, |