opensourcemirror
/
neovim
mirror of https://github.com/neovim/neovim.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

9a91d2b72c
This commit is contained in:
zeertzjq 2024-04-10 06:07:29 +08:00 committed by GitHub
parent f398552eb1
commit efb6640b29
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 59 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/eval/userfunc.c
View File

@ -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) {

52
test/old/testdir/test_let.vim
View File

@ -397,6 +397,42 @@ func Test_let_heredoc_fails()
call assert_report('Caught exception: ' .. v:exception)
endtry
try
let @- =<< trim TEXT
change
insert
append
TEXT
call assert_report('No exception thrown')
catch /E730:/
catch
call assert_report('Caught exception: ' .. v:exception)
endtry
try
let [a b c] =<< trim TEXT
change
insert
append
TEXT
call assert_report('No exception thrown')
catch /E475:/
catch
call assert_report('Caught exception: ' .. v:exception)
endtry
try
let [a; b; c] =<< trim TEXT
change
insert
append
TEXT
call assert_report('No exception thrown')
catch /E452:/
catch
call assert_report('Caught exception: ' .. v:exception)
endtry
let text =<< trim END
func WrongSyntax()
let v =<< that there
@ -569,6 +605,22 @@ append
END
call assert_equal(['change', 'insert', 'append'], [a, b, c])
" unpack assignment with semicolon
let [a; b] =<< END
change
insert
append
END
call assert_equal(['change', ['insert', 'append']], [a, b])
" unpack assignment with registers
let [@/, @", @-] =<< END
change
insert
append
END
call assert_equal(['change', 'insert', 'append'], [@/, @", @-])
" curly braces name and list slice assignment
let foo_3_bar = ['', '', '']
let foo_{1 + 2}_bar[ : ] =<< END