Mercurial > vim
diff src/userfunc.c @ 18536:c0cd979000f9 v8.1.2262
patch 8.1.2262: unpack assignment in function not recognized
Commit: https://github.com/vim/vim/commit/1e673b9eb686459bd0e7fc3f2199dd077546a18e
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Nov 6 15:02:50 2019 +0100
patch 8.1.2262: unpack assignment in function not recognized
Problem: Unpack assignment in function not recognized.
Solution: Skip over "[a, b]". (closes https://github.com/vim/vim/issues/5051)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 06 Nov 2019 15:15:03 +0100 |
| parents | fe5afdc03bd2 |
| children | 23fef64352a1 |
line wrap: on
line diff
--- a/src/userfunc.c +++ b/src/userfunc.c @@ -2482,25 +2482,31 @@ ex_function(exarg_T *eap) } // 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; } }