Skip to content

Commit

Permalink
patch 8.2.1098: Vim9: cannot use line break in :throw argument
Browse files Browse the repository at this point in the history
Problem:    Vim9: cannot use line break in :throw argument.
Solution:   Check for line break.
  • Loading branch information
brammool committed Jun 30, 2020
1 parent e46a440 commit 006ad48
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/eval.c
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,18 @@ eval_to_string_skip(
{
typval_T tv;
char_u *retval;
evalarg_T evalarg;

CLEAR_FIELD(evalarg);
evalarg.eval_flags = skip ? 0 : EVAL_EVALUATE;
if (eap != NULL && getline_equal(eap->getline, eap->cookie, getsourceline))
{
evalarg.eval_getline = eap->getline;
evalarg.eval_cookie = eap->cookie;
}
if (skip)
++emsg_skip;
if (eval0(arg, &tv, eap, skip ? NULL : &EVALARG_EVALUATE) == FAIL || skip)
if (eval0(arg, &tv, eap, &evalarg) == FAIL || skip)
retval = NULL;
else
{
Expand All @@ -345,7 +353,7 @@ eval_to_string_skip(
}
if (skip)
--emsg_skip;
clear_evalarg(&EVALARG_EVALUATE, eap);
clear_evalarg(&evalarg, eap);

return retval;
}
Expand Down
14 changes: 14 additions & 0 deletions src/testdir/test_vim9_script.vim
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,20 @@ def Test_try_catch_fails()
call CheckDefFailure(['throw xxx'], 'E1001:')
enddef

def Test_throw_vimscript()
" only checks line continuation
let lines =<< trim END
vim9script
try
throw 'one'
.. 'two'
catch
assert_equal('onetwo', v:exception)
endtry
END
CheckScriptSuccess(lines)
enddef

if has('channel')
let someJob = test_null_job()

Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,8 @@ static char *(features[]) =

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

0 comments on commit 006ad48

Please sign in to comment.