aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.2262: unpack assignment in function not recognized

Browse Source 
Problem:    Unpack assignment in function not recognized.
Solution:   Skip over "[a, b]". (closes #5051)
This commit is contained in:
Bram Moolenaar 2019-11-06 15:02:50 +01:00
parent 177c9f2f06
commit 1e673b9eb6
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/testdir/test_let.vim
View File

@ -303,4 +303,12 @@ E
END END
endif endif
call assert_equal([], check) 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 endfunc

34
src/userfunc.c
View File

@ -2482,25 +2482,31 @@ ex_function(exarg_T *eap)
} }
// Check for ":let v =<< [trim] EOF" // Check for ":let v =<< [trim] EOF"
// and ":let [a, b] =<< [trim] EOF"
arg = skipwhite(skiptowhite(p)); arg = skipwhite(skiptowhite(p));
arg = skipwhite(skiptowhite(arg)); if (*arg == '[')
if (arg[0] == '=' && arg[1] == '<' && arg[2] =='<' arg = vim_strchr(arg, ']');
&& ((p[0] == 'l' if (arg != NULL)
&& p[1] == 'e'
&& (!ASCII_ISALNUM(p[2])
|| (p[2] == 't' && !ASCII_ISALNUM(p[3]))))))
{ {
p = skipwhite(arg + 3); arg = skipwhite(skiptowhite(arg));
if (STRNCMP(p, "trim", 4) == 0) 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(arg + 3);
p = skipwhite(p + 4); if (STRNCMP(p, "trim", 4) == 0)
heredoc_trimmed = vim_strnsave(theline, {
// Ignore leading white space.
p = skipwhite(p + 4);
heredoc_trimmed = vim_strnsave(theline,
(int)(skipwhite(theline) - 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;
} }
} }

2
src/version.c
View File

@ -741,6 +741,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 */
/**/
2262,
/**/ /**/
2261, 2261,
/**/ /**/