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.5078: substitute test has a one second delay

Browse Source 
Problem:    Substitute test has a one second delay.
Solution:   Use ":silent!".  Add another test case. (closes #10558)
This commit is contained in:
zeertzjq 2022-06-12 11:13:05 +01:00 committed by Bram Moolenaar
parent a34b4460c2
commit 3269efdf01
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/testdir/test_substitute.vim
View File

@ -469,7 +469,6 @@ func Run_SubCmd_Tests(tests)
for t in a:tests for t in a:tests
let start = line('.') + 1 let start = line('.') + 1
let end = start + len(t[2]) - 1 let end = start + len(t[2]) - 1
" TODO: why is there a one second delay the first time we get here?
exe "normal o" . t[0] exe "normal o" . t[0]
call cursor(start, 1) call cursor(start, 1)
exe t[1] exe t[1]
@ -504,7 +503,8 @@ func Test_sub_cmd_1()
\ ['sSs', 's/S/\c/', ['scs']], \ ['sSs', 's/S/\c/', ['scs']],
\ ['tTt', "s/T/\<C-V>\<C-J>/", ["t\<C-V>\<C-J>t"]], \ ['tTt', "s/T/\<C-V>\<C-J>/", ["t\<C-V>\<C-J>t"]],
\ ['U', 's/U/\L\uuUu\l\EU/', ['UuuU']], \ ['U', 's/U/\L\uuUu\l\EU/', ['UuuU']],
\ ['V', 's/V/\U\lVvV\u\Ev/', ['vVVv']] \ ['V', 's/V/\U\lVvV\u\Ev/', ['vVVv']],
\ ['\', 's/\\/\\\\/', ['\\']]
\ ] \ ]
call Run_SubCmd_Tests(tests) call Run_SubCmd_Tests(tests)
endfunc endfunc
@ -535,7 +535,8 @@ func Test_sub_cmd_2()
\ ['sSs', 's/S/\c/', ['scs']], \ ['sSs', 's/S/\c/', ['scs']],
\ ['tTt', "s/T/\<C-V>\<C-J>/", ["t\<C-V>\<C-J>t"]], \ ['tTt', "s/T/\<C-V>\<C-J>/", ["t\<C-V>\<C-J>t"]],
\ ['U', 's/U/\L\uuUu\l\EU/', ['UuuU']], \ ['U', 's/U/\L\uuUu\l\EU/', ['UuuU']],
\ ['V', 's/V/\U\lVvV\u\Ev/', ['vVVv']] \ ['V', 's/V/\U\lVvV\u\Ev/', ['vVVv']],
\ ['\', 's/\\/\\\\/', ['\\']]
\ ] \ ]
call Run_SubCmd_Tests(tests) call Run_SubCmd_Tests(tests)
endfunc endfunc
@ -690,10 +691,11 @@ func Test_nocatch_sub_failure_handling()
endfunc endfunc
new new
call setline(1, ['1 aaa', '2 aaa', '3 aaa']) call setline(1, ['1 aaa', '2 aaa', '3 aaa'])
%s/aaa/\=Foo()/g " need silent! to avoid a delay when entering Insert mode
silent! %s/aaa/\=Foo()/g
call assert_equal(['1 0', '2 0', '3 0'], getline(1, 3)) call assert_equal(['1 0', '2 0', '3 0'], getline(1, 3))
" Trow without try-catch causes abort after the first line. " Throw without try-catch causes abort after the first line.
" We cannot test this, since it would stop executing the test script. " We cannot test this, since it would stop executing the test script.
" try/catch does not result in any changes " try/catch does not result in any changes

2
src/version.c
View File

@ -734,6 +734,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 */
/**/
5078,
/**/ /**/
5077, 5077,
/**/ /**/