patch 8.2.1099: Vim9: cannot use line break in :cexpr argument

Problem:    Vim9: cannot use line break in :cexpr argument.
Solution:   Check for line break.

diff --git a/src/eval.c b/src/eval.c
index a98eea34bef4e9b9986cfe1fe99533adc36b86c2..060fd0c7d804d158f904d5c9adb237752da0715d 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -153,6 +153,18 @@ eval_clear(void)
 }
 #endif
 
+    static void
+fill_evalarg_from_eap(evalarg_T *evalarg, exarg_T *eap, int skip)
+{
+    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;
+    }
+}
+
 /*
  * Top level evaluation function, returning a boolean.
  * Sets "error" to TRUE if there was an error.
@@ -169,13 +181,7 @@ eval_to_bool(
     varnumber_T        retval = FALSE;
     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;
-    }
+    fill_evalarg_from_eap(&evalarg, eap, skip);
 
     if (skip)
        ++emsg_skip;
@@ -335,13 +341,7 @@ eval_to_string_skip(
     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;
-    }
+    fill_evalarg_from_eap(&evalarg, eap, skip);
     if (skip)
        ++emsg_skip;
     if (eval0(arg, &tv, eap, &evalarg) == FAIL || skip)
@@ -535,12 +535,15 @@ eval_to_number(char_u *expr)
 eval_expr(char_u *arg, exarg_T *eap)
 {
     typval_T   *tv;
+    evalarg_T  evalarg;
+
+    fill_evalarg_from_eap(&evalarg, eap, eap != NULL && eap->skip);
 
     tv = ALLOC_ONE(typval_T);
-    if (tv != NULL && eval0(arg, tv, eap, &EVALARG_EVALUATE) == FAIL)
+    if (tv != NULL && eval0(arg, tv, eap, &evalarg) == FAIL)
        VIM_CLEAR(tv);
-    clear_evalarg(&EVALARG_EVALUATE, eap);
 
+    clear_evalarg(&evalarg, eap);
     return tv;
 }
 
@@ -5239,13 +5242,7 @@ ex_echo(exarg_T *eap)
     int                called_emsg_before = called_emsg;
     evalarg_T  evalarg;
 
-    CLEAR_FIELD(evalarg);
-    evalarg.eval_flags = eap->skip ? 0 : EVAL_EVALUATE;
-    if (getline_equal(eap->getline, eap->cookie, getsourceline))
-    {
-       evalarg.eval_getline = eap->getline;
-       evalarg.eval_cookie = eap->cookie;
-    }
+    fill_evalarg_from_eap(&evalarg, eap, eap != NULL && eap->skip);
 
     if (eap->skip)
        ++emsg_skip;

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 031b31917c41c15f867c4154d0911c7c970422a2..447ea68b664831efbd9ca162448bc960794e34df 100644 (file)
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -599,6 +599,20 @@ def Test_throw_vimscript()
   CheckScriptSuccess(lines)
 enddef
 
+def Test_cexpr_vimscript()
+  " only checks line continuation
+  set errorformat=File\ %f\ line\ %l
+  let lines =<< trim END
+      vim9script
+      cexpr 'File'
+                .. ' someFile' ..
+                   ' line 19'
+      assert_equal(19, getqflist()[0].lnum)
+  END
+  CheckScriptSuccess(lines)
+  set errorformat&
+enddef
+
 if has('channel')
   let someJob = test_null_job()
 

diff --git a/src/version.c b/src/version.c
index 5854c37fcf0faee4e9d644601b0aab714c087d59..0b85aaa75576fa4cd92b142035632568af91a52c 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 */
+/**/
+    1099,
 /**/
     1098,
 /**/