From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 30 Jun 2020 18:55:15 +0000 (+0200)
Subject: patch 8.2.1098: Vim9: cannot use line break in :throw argument
X-Git-Tag: v8.2.1098
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=006ad48b8a15c3bace741d8caaf3195e592fbe78;p=vim

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 5b69dc736..a98eea34b 100644
--- 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 ff1b13422..031b31917 100644
--- 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 c9815bc63..5854c37fc 100644
--- 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,
 /**/