aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.1916: Vim9: function call is aborted even when "silent!" is used

Browse Source 
Problem:    Vim9: function call is aborted even when "silent!" is used.
Solution:   Use did_emsg instead of called_emsg. (closes #7213)
This commit is contained in:
Bram Moolenaar 2020-10-28 16:54:47 +01:00
parent 6cf7e3b026
commit 171fb923b8
3 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/testdir/test_vim9_func.vim
View File

@ -1462,6 +1462,35 @@ func Test_silent_echo()
call delete('XTest_silent_echo') call delete('XTest_silent_echo')
endfunc endfunc
def SilentlyError()
execute('silent! invalid')
g:did_it = 'yes'
enddef
"func UserError()
" silent! invalid
"endfunc
"
"def SilentlyUserError()
" UserError()
" g:did_it = 'yes'
"enddef
" This can't be a :def function, because the assert would not be reached.
" And this must not be inside a try/endtry.
func Test_ignore_silent_error()
let g:did_it = 'no'
call SilentlyError()
call assert_equal('yes', g:did_it)
" this doesn't work yet
" let g:did_it = 'no'
" call SilentlyUserError()
" call assert_equal('yes', g:did_it)
unlet g:did_it
endfunc
def Fibonacci(n: number): number def Fibonacci(n: number): number
if n < 2 if n < 2
return n return n

2
src/version.c
View File

@ -750,6 +750,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 */
/**/
1916,
/**/ /**/
1915, 1915,
/**/ /**/

8
src/vim9execute.c
View File

@ -550,7 +550,7 @@ call_bfunc(int func_idx, int argcount, ectx_T *ectx)
{ {
typval_T argvars[MAX_FUNC_ARGS]; typval_T argvars[MAX_FUNC_ARGS];
int idx; int idx;
int called_emsg_before = called_emsg; int did_emsg_before = did_emsg;
ectx_T *prev_ectx = current_ectx; ectx_T *prev_ectx = current_ectx;
if (call_prepare(argcount, argvars, ectx) == FAIL) if (call_prepare(argcount, argvars, ectx) == FAIL)
@ -566,7 +566,7 @@ call_bfunc(int func_idx, int argcount, ectx_T *ectx)
for (idx = 0; idx < argcount; ++idx) for (idx = 0; idx < argcount; ++idx)
clear_tv(&argvars[idx]); clear_tv(&argvars[idx]);
if (called_emsg != called_emsg_before) if (did_emsg != did_emsg_before)
return FAIL; return FAIL;
return OK; return OK;
} }
@ -834,6 +834,7 @@ call_def_function(
msglist_T *private_msg_list = NULL; msglist_T *private_msg_list = NULL;
cmdmod_T save_cmdmod; cmdmod_T save_cmdmod;
int restore_cmdmod = FALSE; int restore_cmdmod = FALSE;
int trylevel_at_start = trylevel;
// Get pointer to item in the stack. // Get pointer to item in the stack.
#define STACK_TV(idx) (((typval_T *)ectx.ec_stack.ga_data) + idx) #define STACK_TV(idx) (((typval_T *)ectx.ec_stack.ga_data) + idx)
@ -2866,7 +2867,8 @@ func_return:
continue; continue;
on_error: on_error:
if (trylevel == 0) // If we are not inside a try-catch started here, abort execution.
if (trylevel <= trylevel_at_start)
goto failed; goto failed;
} }