patch 8.2.1324: Vim9: line break after "=" does not work
Problem: Vim9: line break after "=" does not work.
Solution: Also allow for NUL after "=". (closes #6549)
diff --git a/src/evalvars.c b/src/evalvars.c
index f409f8c..73c4da6 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -801,13 +801,13 @@
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 @@
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 0166072..405d487 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -358,6 +358,25 @@
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 033f360..0734bdc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1324,
+/**/
1323,
/**/
1322,