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: