To: vim_dev@googlegroups.com Subject: Patch 8.2.1324 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1324 Problem: Vim9: line break after "=" does not work. Solution: Also allow for NUL after "=". (closes #6549) Files: src/evalvars.c, src/testdir/test_vim9_script.vim *** ../vim-8.2.1323/src/evalvars.c 2020-07-26 17:56:20.448638742 +0200 --- src/evalvars.c 2020-07-29 21:32:36.782944403 +0200 *************** *** 801,813 **** else ++expr; ! if (vim9script && (!VIM_ISWHITE(*argend) || !VIM_ISWHITE(*expr))) { vim_strncpy(op, expr - len, len); semsg(_(e_white_both), op); i = FAIL; } - expr = skipwhite(expr); if (eap->skip) ++emsg_skip; --- 801,813 ---- else ++expr; ! if (vim9script && (!VIM_ISWHITE(*argend) ! || !IS_WHITE_OR_NUL(*expr))) { vim_strncpy(op, expr - len, len); semsg(_(e_white_both), op); i = FAIL; } if (eap->skip) ++emsg_skip; *************** *** 818,823 **** --- 818,824 ---- 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; *** ../vim-8.2.1323/src/testdir/test_vim9_script.vim 2020-07-29 19:17:57.328394592 +0200 --- src/testdir/test_vim9_script.vim 2020-07-29 21:36:30.385879536 +0200 *************** *** 358,363 **** --- 358,382 ---- assert_equal(['three'], vrem) enddef + def Test_assignment_vim9script() + let lines =<< trim END + vim9script + def Func(): list + 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' *** ../vim-8.2.1323/src/version.c 2020-07-29 21:20:37.926626437 +0200 --- src/version.c 2020-07-29 21:36:53.557827551 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1324, /**/ -- From "know your smileys": % Bike accident. A bit far-fetched, I suppose; although... o _ _ _ _o /\_ _ \\o (_)\__/o (_) _< \_ _>(_) (_)/<_ \_| \ _|/' \/ (_)>(_) (_) (_) (_) (_)' _\o_ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///