aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 9.1.0319: Using heredoc in string not tested with :execute

Browse Source 
Problem:  Using heredoc in string not tested with :execute.
Solution: Test with both :execute and execute() (zeertzjq).

closes: #14546

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2024-04-14 18:49:56 +02:00
committed by Christian Brabandt
parent acba5af957
commit 3d93630605
2 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/testdir/test_let.vim
View File

@@ -722,31 +722,33 @@ END
LINES
call v9.CheckScriptFailure(lines, 'E15:')
" Test for using heredoc in a single string using execute()
call assert_equal("\n['one', 'two']",
\ execute("let x =<< trim END\n one\n two\nEND\necho x"))
call assert_equal("\n['one', ' two']",
\ execute("let x =<< trim END\n one\n two\nEND\necho x"))
call assert_equal("\n['one', 'two']",
\ execute(" let x =<< trim END\n one\n two\n END\necho x"))
call assert_equal("\n['one', ' two']",
\ execute(" let x =<< trim END\n one\n two\n END\necho x"))
call assert_equal("\n[' one', ' two']",
\ execute("let x =<< END\n one\n two\nEND\necho x"))
call assert_equal("\n['one', 'two']",
\ execute("let x =<< END\none\ntwo\nEND\necho x"))
call assert_equal("\n['one', 'two']",
\ execute("let x =<< END \" comment\none\ntwo\nEND\necho x"))
let cmd = 'execute("let x =<< END\n one\n two\necho x")'
call assert_fails(cmd, "E990: Missing end marker 'END'")
let cmd = 'execute("let x =<<\n one\n two\necho x")'
call assert_fails(cmd, "E172: Missing marker")
let cmd = 'execute("let x =<< trim\n one\n two\necho x")'
call assert_fails(cmd, "E172: Missing marker")
let cmd = 'execute("let x =<< end\n one\n two\nend\necho x")'
call assert_fails(cmd, "E221: Marker cannot start with lower case letter")
let cmd = 'execute("let x =<< eval END\n one\n two{y}\nEND\necho x")'
call assert_fails(cmd, 'E121: Undefined variable: y')
" Test for using heredoc in a single string using :execute or execute()
for [cmd, res] in items({
\ "let x =<< trim END\n one\n two\nEND": ['one', 'two'],
\ "let x =<< trim END\n one\n two\nEND": ['one', ' two'],
\ " let x =<< trim END\n one\n two\n END": ['one', 'two'],
\ " let x =<< trim END\n one\n two\n END": ['one', ' two'],
\ "let x =<< END\n one\n two\nEND": [' one', ' two'],
\ "let x =<< END\none\ntwo\nEND": ['one', 'two'],
\ "let x =<< END \" comment\none\ntwo\nEND": ['one', 'two'],
\ })
execute cmd
call assert_equal(res, x)
unlet x
call assert_equal($"\n{string(res)}", execute($"{cmd}\necho x"))
unlet x
endfor
for [cmd, err] in items({
\ "let x =<<\none\ntwo": "E172:",
\ "let x =<< trim\n one\n two": "E172:",
\ "let x =<< end\none\ntwo\nend": "E221:",
\ "let x =<< END\none\ntwo": "E990: Missing end marker 'END'",
\ "let x =<< END !\none\ntwo\nEND": "E488: Trailing characters: !",
\ "let x =<< eval END\none\ntwo{y}\nEND": "E121: Undefined variable: y",
\ })
call assert_fails('execute cmd', err)
call assert_fails('call execute(cmd)', err)
endfor
" skipped heredoc
if 0

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
319,
/**/
318,
/**/