aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2024-04-10 06:07:29 +0800
committerGitHub <noreply@github.com>2024-04-10 06:07:29 +0800
commitefb6640b2937dacef9eec1b2ace11b85b3b44a4a (patch)
treeb57cf4a4a810cec76da5345f5e613bc1bb1f03ab /src
parentf398552eb16c19c8410214ddcfa3980180818a58 (diff)
downloadrneovim-efb6640b2937dacef9eec1b2ace11b85b3b44a4a.tar.gz
rneovim-efb6640b2937dacef9eec1b2ace11b85b3b44a4a.tar.bz2
rneovim-efb6640b2937dacef9eec1b2ace11b85b3b44a4a.zip
vim-patch:9.1.0287: Vim9: comment may be treated as heredoc start (#28257)
Problem: Vim9: comment may be treated as heredoc start. (Ernie Rael) Solution: Use skip_var_list() instead of find_name_end(). (zeertzjq) fixes: vim/vim#14444 closes: vim/vim#14446 https://github.com/vim/vim/commit/9a91d2b72c20f213bbf77f27b7edd01e0e43d5e0
Diffstat (limited to 'src')
-rw-r--r--src/nvim/eval/userfunc.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c
index 27f7f42739..72559fe9e0 100644
--- a/src/nvim/eval/userfunc.c
+++ b/src/nvim/eval/userfunc.c
@@ -2576,10 +2576,14 @@ void ex_function(exarg_T *eap)
// and ":let [a, b] =<< [trim] EOF"
arg = p;
if (checkforcmd(&arg, "let", 2)) {
- while (vim_strchr("$@&", *arg) != NULL) {
- arg++;
+ int var_count = 0;
+ int semicolon = 0;
+ const char *argend = skip_var_list(arg, &var_count, &semicolon, true);
+ if (argend == NULL) {
+ // Invalid list assignment: skip to closing bracket.
+ argend = find_name_end(arg, NULL, NULL, FNE_INCL_BR);
}
- arg = skipwhite(find_name_end(arg, NULL, NULL, FNE_INCL_BR));
+ arg = skipwhite(argend);
if (arg[0] == '=' && arg[1] == '<' && arg[2] == '<') {
p = skipwhite(arg + 3);
while (true) {