patch 8.2.1098: Vim9: cannot use line break in :throw argument
Problem: Vim9: cannot use line break in :throw argument.
Solution: Check for line break.
diff --git a/src/eval.c b/src/eval.c
index 5b69dc7..a98eea3 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -333,10 +333,18 @@
{
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
{
@@ -345,7 +353,7 @@
}
if (skip)
--emsg_skip;
- clear_evalarg(&EVALARG_EVALUATE, eap);
+ clear_evalarg(&evalarg, eap);
return retval;
}
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index ff1b134..031b319 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -585,6 +585,20 @@
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()
diff --git a/src/version.c b/src/version.c
index c9815bc..5854c37 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1098,
+/**/
1097,
/**/
1096,