diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-29 21:37:43 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-29 21:37:43 +0200 |
| commit | c7e44a7e4caedc1bc33f5c8e481109c0ae002823 (patch) | |
| tree | b02eb9d1c71a798dcc24182932ef22b449c95030 | |
| parent | 696ba23149eb5a7226e606e3fe6f15fdd064c5f7 (diff) | |
patch 8.2.1324: Vim9: line break after "=" does not workv8.2.1324
Problem: Vim9: line break after "=" does not work.
Solution: Also allow for NUL after "=". (closes #6549)
| -rw-r--r-- | src/evalvars.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_vim9_script.vim | 19 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 24 insertions, 2 deletions
diff --git a/src/evalvars.c b/src/evalvars.c index f409f8c006..73c4da6c6e 100644 --- a/src/evalvars.c +++ b/src/evalvars.c @@ -801,13 +801,13 @@ ex_let(exarg_T *eap) else ++expr; - if (vim9script && (!VIM_ISWHITE(*argend) || !VIM_ISWHITE(*expr))) + if (vim9script && (!VIM_ISWHITE(*argend) + || !IS_WHITE_OR_NUL(*expr))) { vim_strncpy(op, expr - len, len); semsg(_(e_white_both), op); i = FAIL; } - expr = skipwhite(expr); if (eap->skip) ++emsg_skip; @@ -818,6 +818,7 @@ ex_let(exarg_T *eap) evalarg.eval_getline = eap->getline; evalarg.eval_cookie = eap->cookie; } + expr = skipwhite_and_linebreak(expr, &evalarg); i = eval0(expr, &rettv, eap, &evalarg); if (eap->skip) --emsg_skip; diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index 0166072f16..405d4877a2 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -358,6 +358,25 @@ def Test_assignment_var_list() assert_equal(['three'], vrem) enddef +def Test_assignment_vim9script() + let lines =<< trim END + vim9script + def Func(): list<number> + return [1, 2] + enddef + let var1: number + let var2: number + [var1, var2] = + Func() + assert_equal(1, var1) + assert_equal(2, var2) + let ll = + Func() + assert_equal([1, 2], ll) + END + CheckScriptSuccess(lines) +enddef + def Mess(): string v:foldstart = 123 return 'xxx' diff --git a/src/version.c b/src/version.c index 033f36072f..0734bdc1e3 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 */ /**/ + 1324, +/**/ 1323, /**/ 1322, |