0
0
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00

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)
This commit is contained in:
Bram Moolenaar
2020-07-20 22:37:44 +02:00
parent 7892b953e0
commit b31be3f909
3 changed files with 26 additions and 3 deletions

View File

@@ -3282,10 +3282,19 @@ find_ex_command(
// after the "]" by to_name_const_end(): check if a "=" follows. // 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 // If "[...]" has a line break "p" still points at the "[" and it can't
// be an assignment. // be an assignment.
if (*eap->cmd == '[' && (p == eap->cmd || *skipwhite(p) != '=')) if (*eap->cmd == '[')
{ {
eap->cmdidx = CMD_eval; p = to_name_const_end(eap->cmd);
return 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: // Recognize an assignment if we recognize the variable name:

View File

@@ -169,6 +169,18 @@ def Test_assignment_list()
let somelist = rand() > 0 ? [1, 2, 3] : ['a', 'b', 'c'] let somelist = rand() > 0 ? [1, 2, 3] : ['a', 'b', 'c']
enddef 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() def Test_assignment_dict()
let dict1: dict<bool> = #{one: false, two: true} let dict1: dict<bool> = #{one: false, two: true}
let dict2: dict<number> = #{one: 1, two: 2} let dict2: dict<number> = #{one: 1, two: 2}

View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1257,
/**/ /**/
1256, 1256,
/**/ /**/