changeset 21548:4e679db1c404 v8.2.1324

patch 8.2.1324: Vim9: line break after "=" does not work Commit: https://github.com/vim/vim/commit/c7e44a7e4caedc1bc33f5c8e481109c0ae002823 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jul 29 21:37:43 2020 +0200 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 https://github.com/vim/vim/issues/6549)
author Bram Moolenaar <Bram@vim.org>
date Wed, 29 Jul 2020 21:45:04 +0200
parents a24d2c2cbffd
children c32589555cc6
files src/evalvars.c src/testdir/test_vim9_script.vim src/version.c
diffstat 3 files changed, 24 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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'
--- 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,