thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

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

Browse Source 
Problem:    Wrong line number reported when :cexpr fails in :def function.
Solution:   Set line_number before executing :cexpr. (closes #10735)
This commit is contained in:
Bram Moolenaar 2022-07-18 17:49:03 +01:00
parent fa49eb4827
commit bd683e3a79
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/testdir/test_vim9_func.vim
View File

@ -4205,6 +4205,18 @@ def Test_multiple_funcref()
v9.CheckScriptSuccess(lines) v9.CheckScriptSuccess(lines)
enddef 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. " The following messes up syntax highlight, keep near the end.
if has('python3') if has('python3')
def Test_python3_command() def Test_python3_command()

2
src/version.c
View File

@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
56,
/**/ /**/
55, 55,
/**/ /**/

1
src/vim9execute.c
View File

@ -2786,6 +2786,7 @@ exec_instructions(ectx_T *ectx)
ea.cmdlinep = &iptr->isn_arg.cexpr.cexpr_ref->cer_cmdline; ea.cmdlinep = &iptr->isn_arg.cexpr.cexpr_ref->cer_cmdline;
--ectx->ec_stack.ga_len; --ectx->ec_stack.ga_len;
tv = STACK_TV_BOT(0); tv = STACK_TV_BOT(0);
SOURCING_LNUM = iptr->isn_lnum;
res = cexpr_core(&ea, tv); res = cexpr_core(&ea, tv);
clear_tv(tv); clear_tv(tv);
if (res == FAIL) if (res == FAIL)