patch 8.1.2262: unpack assignment in function not recognized
Problem: Unpack assignment in function not recognized.
Solution: Skip over "[a, b]". (closes #5051)
diff --git a/src/testdir/test_let.vim b/src/testdir/test_let.vim
index 64d178c..76b7505 100644
--- a/src/testdir/test_let.vim
+++ b/src/testdir/test_let.vim
@@ -303,4 +303,12 @@
END
endif
call assert_equal([], check)
+
+ " unpack assignment
+ let [a, b, c] =<< END
+ x
+ \y
+ z
+END
+ call assert_equal([' x', ' \y', ' z'], [a, b, c])
endfunc
diff --git a/src/userfunc.c b/src/userfunc.c
index a775212..40eb144 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -2482,25 +2482,31 @@
}
// Check for ":let v =<< [trim] EOF"
+ // and ":let [a, b] =<< [trim] EOF"
arg = skipwhite(skiptowhite(p));
- arg = skipwhite(skiptowhite(arg));
- if (arg[0] == '=' && arg[1] == '<' && arg[2] =='<'
- && ((p[0] == 'l'
- && p[1] == 'e'
- && (!ASCII_ISALNUM(p[2])
- || (p[2] == 't' && !ASCII_ISALNUM(p[3]))))))
+ if (*arg == '[')
+ arg = vim_strchr(arg, ']');
+ if (arg != NULL)
{
- p = skipwhite(arg + 3);
- if (STRNCMP(p, "trim", 4) == 0)
+ arg = skipwhite(skiptowhite(arg));
+ if ( arg[0] == '=' && arg[1] == '<' && arg[2] =='<'
+ && ((p[0] == 'l'
+ && p[1] == 'e'
+ && (!ASCII_ISALNUM(p[2])
+ || (p[2] == 't' && !ASCII_ISALNUM(p[3]))))))
{
- // Ignore leading white space.
- p = skipwhite(p + 4);
- heredoc_trimmed = vim_strnsave(theline,
+ p = skipwhite(arg + 3);
+ if (STRNCMP(p, "trim", 4) == 0)
+ {
+ // Ignore leading white space.
+ p = skipwhite(p + 4);
+ heredoc_trimmed = vim_strnsave(theline,
(int)(skipwhite(theline) - theline));
+ }
+ skip_until = vim_strnsave(p, (int)(skiptowhite(p) - p));
+ do_concat = FALSE;
+ is_heredoc = TRUE;
}
- skip_until = vim_strnsave(p, (int)(skiptowhite(p) - p));
- do_concat = FALSE;
- is_heredoc = TRUE;
}
}
diff --git a/src/version.c b/src/version.c
index 4ae3f0e..e086561 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2262,
+/**/
2261,
/**/
2260,