Skip to content

Commit

Permalink
patch 8.2.4055: Vim9: line break in expression causes v:errmsg to be …
Browse files Browse the repository at this point in the history
…fillec

Problem:    Vim9: line break in expression causes v:errmsg to be filled.
            (Yegappan Lakshmanan)
Solution:   Do not give an error when skipping over an expression.
  • Loading branch information
brammool committed Jan 10, 2022
1 parent 577bd85 commit 5e6b988
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 3 deletions.
16 changes: 16 additions & 0 deletions src/testdir/test_vim9_expr.vim
Original file line number Diff line number Diff line change
Expand Up @@ -3147,6 +3147,22 @@ def Test_expr7_method_call()
CheckDefExecFailure(lines, 'E1013:')
enddef

def Test_expr7_method_call_linebreak()
# this was giving an error when skipping over the expression
var lines =<< trim END
vim9script
def Test()
var a: dict<any> = {b: {}}
a.b->extend({f1: 1,
f2: 2})
echo a
enddef
defcompile
assert_equal('', v:errmsg)
END
CheckScriptSuccess(lines)
enddef


def Test_expr7_not()
var lines =<< trim END
Expand Down
11 changes: 8 additions & 3 deletions src/userfunc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1703,6 +1703,8 @@ get_func_tv(
typval_T argvars[MAX_FUNC_ARGS + 1]; // vars for arguments
int argcount = 0; // number of arguments found
int vim9script = in_vim9script();
int evaluate = evalarg == NULL
? FALSE : (evalarg->eval_flags & EVAL_EVALUATE);

/*
* Get the arguments.
Expand All @@ -1728,7 +1730,9 @@ get_func_tv(
{
if (*argp != ',' && *skipwhite(argp) == ',')
{
semsg(_(e_no_white_space_allowed_before_str_str), ",", argp);
if (evaluate)
semsg(_(e_no_white_space_allowed_before_str_str),
",", argp);
ret = FAIL;
break;
}
Expand All @@ -1739,7 +1743,8 @@ get_func_tv(
break;
if (vim9script && !IS_WHITE_OR_NUL(argp[1]))
{
semsg(_(e_white_space_required_after_str_str), ",", argp);
if (evaluate)
semsg(_(e_white_space_required_after_str_str), ",", argp);
ret = FAIL;
break;
}
Expand Down Expand Up @@ -1778,7 +1783,7 @@ get_func_tv(

funcargs.ga_len -= i;
}
else if (!aborting())
else if (!aborting() && evaluate)
{
if (argcount == MAX_FUNC_ARGS)
emsg_funcname(e_too_many_arguments_for_function_str_2, name);
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4055,
/**/
4054,
/**/
Expand Down

0 comments on commit 5e6b988

Please sign in to comment.