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 #6494)
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 91a5168..db1df0d 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3282,10 +3282,19 @@
// 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) != '='))
+ if (*eap->cmd == '[')
{
- eap->cmdidx = CMD_eval;
- return 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
index fa5ee3c..59727a2 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -169,6 +169,18 @@
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}
diff --git a/src/version.c b/src/version.c
index ee1e3f4..cc7fbfb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1257,
+/**/
1256,
/**/
1255,