kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-31 17:13:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.0846: using assert_fails() may cause hit-enter prompt

Browse Source 
Problem:    Using assert_fails() may cause hit-enter prompt.
Solution:   Set no_wait_return. (closes vim/vim#11522)

f220643c26

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq 2023-05-05 12:53:39 +08:00
parent 050b24cbcc
commit 49a2bb9117
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/testing.c
View File

@ -522,14 +522,13 @@ void f_assert_fails(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
return; return;
} }
const char *const cmd = tv_get_string_chk(&argvars[0]);
// trylevel must be zero for a ":throw" command to be considered failed // trylevel must be zero for a ":throw" command to be considered failed
trylevel = 0; trylevel = 0;
suppress_errthrow = true; suppress_errthrow = true;
in_assert_fails = true; in_assert_fails = true;
no_wait_return++; no_wait_return++;
const char *const cmd = tv_get_string_chk(&argvars[0]);
do_cmdline_cmd(cmd); do_cmdline_cmd(cmd);
// reset here for any errors reported below // reset here for any errors reported below

6
test/old/testdir/test_assert.vim
View File

@ -327,6 +327,12 @@ func Test_assert_fails_in_try_block()
endtry endtry
endfunc endfunc
func Test_assert_fails_in_timer()
" should not cause a hit-enter prompt, which isn't actually checked here
call timer_start(0, {-> assert_fails('call', 'E471:')})
sleep 10m
endfunc
func Test_assert_beeps() func Test_assert_beeps()
new new
call assert_equal(0, assert_beeps('normal h')) call assert_equal(0, assert_beeps('normal h'))