aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-23 08:44:20 -04:00
Code Activity

patch 8.2.0276: Vim9: not allowing space before ")" in function call

Browse Source 
Problem:    Vim9: not allowing space before ")" in function call is too
            restrictive. (Ben Jackson)
Solution:   Skip space before the ")".  Adjust other space checks.
This commit is contained in:
Bram Moolenaar
2020-02-19 12:40:39 +01:00
parent 406cd90f19
commit 38a5f517a7
3 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/testdir/test_vim9_expr.vim
View File

@@ -9,6 +9,14 @@ func CheckDefFailure(line, error)
call delete('Xdef')
endfunc
" Check that "line" inside ":def" results in an "error" message when executed.
func CheckDefExecFailure(line, error)
call writefile(['def! Func()', a:line, 'enddef'], 'Xdef')
so Xdef
call assert_fails('call Func()', a:error, a:line)
call delete('Xdef')
endfunc
func CheckDefFailureList(lines, error)
call writefile(['def! Func()'] + a:lines + ['enddef'], 'Xdef')
call assert_fails('so Xdef', a:error, string(a:lines))
@@ -725,9 +733,17 @@ func CallMe(arg)
return a:arg
endfunc
func CallMe2(one, two)
return a:one .. a:two
endfunc
def Test_expr7_trailing()
" user function call
assert_equal(123, CallMe(123))
assert_equal(123, CallMe( 123))
assert_equal(123, CallMe(123 ))
assert_equal('yesno', CallMe2('yes', 'no'))
assert_equal('yesno', CallMe2( 'yes', 'no' ))
assert_equal('nothing', CallMe('nothing'))
" partial call
@@ -761,4 +777,8 @@ endfunc
func Test_expr_fails()
call CheckDefFailure("let x = '1'is2", 'E488:')
call CheckDefFailure("let x = '1'isnot2", 'E488:')
call CheckDefExecFailure("CallMe ('yes')", 'E492:')
call CheckDefFailure("CallMe2('yes','no')", 'E1069:')
call CheckDefFailure("CallMe2('yes' , 'no')", 'E1068:')
endfunc

2
src/version.c
View File

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

16
src/vim9compile.c
View File

@@ -1658,9 +1658,21 @@ compile_arguments(char_u **arg, cctx_T *cctx, int *argcount)
if (compile_expr1(&p, cctx) == FAIL)
return FAIL;
++*argcount;
if (*p == ',')
p = skipwhite(p + 1);
if (*p != ',' && *skipwhite(p) == ',')
{
emsg(_("E1068: No white space allowed before ,"));
p = skipwhite(p);
}
if (*p == ',')
{
++p;
if (!VIM_ISWHITE(*p))
emsg(_("E1069: white space required after ,"));
}
p = skipwhite(p);
}
p = skipwhite(p);
if (*p != ')')
{
emsg(_(e_missing_close));