GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-07-16 01:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch 9.0.1876: Vim9: parsing commands with newlines wrong

Browse Source 
Problem:  Vim9: parsing commands with newlines wrong
Solution: Accept a '\n' for parsing lists and command arguments

closes: #13015
closes: #13020

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2023-09-05 20:46:25 +02:00
parent 28a60f898d
commit 00cb247465
7 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ex_docmd.c
View File

@ -3954,7 +3954,7 @@ find_ex_command(
#ifdef FEAT_EVAL
if (eap->cmdidx < CMD_SIZE
&& vim9
&& !IS_WHITE_OR_NUL(*p) && *p != '\n' && *p != '!' && *p != '|'
&& !IS_WHITE_NL_OR_NUL(*p) && *p != '!' && *p != '|'
&& (eap->cmdidx < 0 ||
(cmdnames[eap->cmdidx].cmd_argt & EX_NONWHITE_OK) == 0))
{

2
src/list.c
View File

@ -1592,7 +1592,7 @@ eval_list(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int do_error)
had_comma = **arg == ',';
if (had_comma)
{
if (vim9script && !IS_WHITE_OR_NUL((*arg)[1]) && (*arg)[1] != ']')
if (vim9script && !IS_WHITE_NL_OR_NUL((*arg)[1]) && (*arg)[1] != ']')
{
semsg(_(e_white_space_required_after_str_str), ",", *arg);
goto failret;

1
src/macros.h
View File

@ -43,6 +43,7 @@
*/
#define VIM_ISWHITE(x) ((x) == ' ' || (x) == '\t')
#define IS_WHITE_OR_NUL(x) ((x) == ' ' || (x) == '\t' || (x) == NUL)
#define IS_WHITE_NL_OR_NUL(x) ((x) == ' ' || (x) == '\t' || (x) == '\n' || (x) == NUL)
/*
* LINEEMPTY() - return TRUE if the line is empty

1
src/testdir/test_crash.vim
View File

@ -62,7 +62,6 @@ func Test_crash1()
let file = 'crash/vim_regsub_both_poc'
let args = printf(cmn_args, vim, file)
" using || because this poc causes vim to exit with exitstatus != 0
call term_sendkeys(buf, args ..
\ ' && echo "crash 7: [OK]" >> X_crash1_result.txt' .. "\<cr>")
call TermWait(buf, 1000)

27
src/testdir/test_usercommands.vim
View File

@ -772,6 +772,33 @@ func Test_usercmd_with_block()
END
call v9.CheckScriptFailure(lines, 'E1128:')
delcommand BadCommand
let lines =<< trim END
vim9script
command Cmd {
g:result = [1,
2]
}
Cmd
END
call v9.CheckScriptSuccess(lines)
call assert_equal([1, 2], g:result)
delcommand Cmd
unlet! g:result
let lines =<< trim END
vim9script
command Cmd {
g:result = and(0x80,
0x80)
}
Cmd
END
call v9.CheckScriptSuccess(lines)
call assert_equal(128, g:result)
delcommand Cmd
unlet! g:result
endfunc
func Test_delcommand_buffer()

2
src/userfunc.c
View File

@ -1879,7 +1879,7 @@ get_func_arguments(
argp = skipwhite(argp);
if (*argp != ',')
break;
if (vim9script && !IS_WHITE_OR_NUL(argp[1]))
if (vim9script && !IS_WHITE_NL_OR_NUL(argp[1]))
{
if (evaluate)
semsg(_(e_white_space_required_after_str_str), ",", argp);

2
src/version.c
View File

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