# HG changeset patch # User Bram Moolenaar # Date 1595277903 -7200 # Node ID 8992d4f63761cd1a594b6f916b5949bc6b02de48 # Parent 8f8535649ef12718f715562ff1390de0ef5aa42c patch 8.2.1257: Vim9: list unpack doesn't work at the script level Commit: https://github.com/vim/vim/commit/b31be3f909e074214b7f346888209c866faed56f Author: Bram Moolenaar Date: Mon Jul 20 22:37:44 2020 +0200 patch 8.2.1257: Vim9: list unpack doesn't work at the script level Problem: Vim9: list unpack doesn't work at the script level. Solution: Detect unpack assignment better. (closes https://github.com/vim/vim/issues/6494) diff --git a/src/ex_docmd.c b/src/ex_docmd.c --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -3282,10 +3282,19 @@ find_ex_command( // after the "]" by to_name_const_end(): check if a "=" follows. // If "[...]" has a line break "p" still points at the "[" and it can't // be an assignment. - if (*eap->cmd == '[' && (p == eap->cmd || *skipwhite(p) != '=')) - { - eap->cmdidx = CMD_eval; - return eap->cmd; + if (*eap->cmd == '[') + { + p = to_name_const_end(eap->cmd); + if (p == eap->cmd || *skipwhite(p) != '=') + { + eap->cmdidx = CMD_eval; + return eap->cmd; + } + if (p > eap->cmd && *skipwhite(p) == '=') + { + eap->cmdidx = CMD_let; + return eap->cmd; + } } // Recognize an assignment if we recognize the variable name: diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -169,6 +169,18 @@ def Test_assignment_list() let somelist = rand() > 0 ? [1, 2, 3] : ['a', 'b', 'c'] enddef +def Test_assignment_list_vim9script() + let lines =<< trim END + vim9script + let v1: number + let v2: number + let v3: number + [v1, v2, v3] = [1, 2, 3] + assert_equal([1, 2, 3], [v1, v2, v3]) + END + call CheckScriptSuccess(lines) +enddef + def Test_assignment_dict() let dict1: dict = #{one: false, two: true} let dict2: dict = #{one: 1, two: 2} diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 1257, +/**/ 1256, /**/ 1255,