commit bd683e3a79d73e608fec0df7cee1109a27f2e70a
author Bram Moolenaar <Bram@vim.org> Mon Jul 18 17:49:03 2022 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Jul 18 17:49:03 2022 +0100
tree 1775b13a919531764de59daddc348be447e246d7
parent fa49eb482729a5fe7da9c9a5ed8d14f68afa55c7

patch 9.0.0056: wrong line number reported when :cexpr fails in :def function

Problem:    Wrong line number reported when :cexpr fails in :def function.
Solution:   Set line_number before executing :cexpr. (closes #10735)

src/testdir/test_vim9_func.vim

diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 33a6615..2714fa1 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -4205,6 +4205,18 @@
   v9.CheckScriptSuccess(lines)
 enddef
 
+def Test_cexpr_errmsg_line_number()
+  var lines =<< trim END
+      vim9script
+      def Func()
+        var qfl = {}
+        cexpr qfl
+      enddef
+      Func()
+  END
+  v9.CheckScriptFailure(lines, 'E777', 2)
+enddef
+
 " The following messes up syntax highlight, keep near the end.
 if has('python3')
   def Test_python3_command()

src/version.c

diff --git a/src/version.c b/src/version.c
index f2304f3..87a8d10 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    56,
+/**/
     55,
 /**/
     54,

src/vim9execute.c

diff --git a/src/vim9execute.c b/src/vim9execute.c
index 9dd5937..2f94f05 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -2786,6 +2786,7 @@
 		    ea.cmdlinep = &iptr->isn_arg.cexpr.cexpr_ref->cer_cmdline;
 		    --ectx->ec_stack.ga_len;
 		    tv = STACK_TV_BOT(0);
+		    SOURCING_LNUM = iptr->isn_lnum;
 		    res = cexpr_core(&ea, tv);
 		    clear_tv(tv);
 		    if (res == FAIL)