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 5b69dc736d1594344e3b2750e1ca97114be486f1..a98eea34bef4e9b9986cfe1fe99533adc36b86c2 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -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
     {
@@ -345,7 +353,7 @@ eval_to_string_skip(
     }
     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 ff1b134227f10ea0889f7629b2c826f24013f30d..031b31917c41c15f867c4154d0911c7c970422a2 100644 (file)
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -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()
 

diff --git a/src/version.c b/src/version.c
index c9815bc639d896c07bc66b2a1f42955c8a9858b3..5854c37fcf0faee4e9d644601b0aab714c087d59 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1098,
 /**/
     1097,
 /**/