mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-14 07:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.1660: assert_fails() inside try/catch #10472

Browse Source 
Problem:    Assert_fails() does not fail inside try/catch.
Solution:   Set trylevel to zero. (Ozaki Kiichi, closes vim/vim#4639)
7780e5c1c5
This commit is contained in:
Daniel Hahler
2019-07-13 00:09:05 +02:00
committed by Justin M. Keyes
parent e682d799fa
commit 108eb4201f
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/eval.c
View File

@@ -7097,10 +7097,14 @@ static void f_assert_fails(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{ {
const char *const cmd = tv_get_string_chk(&argvars[0]); const char *const cmd = tv_get_string_chk(&argvars[0]);
garray_T ga; garray_T ga;
int save_trylevel = trylevel;
// trylevel must be zero for a ":throw" command to be considered failed
trylevel = 0;
called_emsg = false; called_emsg = false;
suppress_errthrow = true; suppress_errthrow = true;
emsg_silent = true; emsg_silent = true;
do_cmdline_cmd(cmd); do_cmdline_cmd(cmd);
if (!called_emsg) { if (!called_emsg) {
prepare_assert_error(&ga); prepare_assert_error(&ga);
@@ -7122,6 +7126,7 @@ static void f_assert_fails(typval_T *argvars, typval_T *rettv, FunPtr fptr)
} }
} }
trylevel = save_trylevel;
called_emsg = false; called_emsg = false;
suppress_errthrow = false; suppress_errthrow = false;
emsg_silent = false; emsg_silent = false;

6
src/nvim/testdir/test_assert.vim
View File

@@ -1,5 +1,11 @@
" Test that the methods used for testing work. " Test that the methods used for testing work.
func Test_assert_fails_in_try_block()
try
call assert_equal(0, assert_fails('throw "error"'))
endtry
endfunc
" Must be last. " Must be last.
func Test_zz_quit_detected() func Test_zz_quit_detected()
" Verify that if a test function ends Vim the test script detects this. " Verify that if a test function ends Vim the test script detects this.