Mercurial > vim
changeset 21413:8992d4f63761 v8.2.1257
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 <Bram@vim.org>
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 20 Jul 2020 22:45:03 +0200 |
| parents | 8f8535649ef1 |
| children | 4650e4659957 |
| files | src/ex_docmd.c src/testdir/test_vim9_script.vim src/version.c |
| diffstat | 3 files changed, 27 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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:
--- 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<bool> = #{one: false, two: true} let dict2: dict<number> = #{one: 1, two: 2}