Mercurial > vim
changeset 29165:0e0e298e05c1 v8.2.5102
patch 8.2.5102: interrupt not caught in test
Commit: https://github.com/vim/vim/commit/8bea171f154845046239c61bdef50a8e0f12f643
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jun 15 20:49:35 2022 +0100
patch 8.2.5102: interrupt not caught in test
Problem: Interrupt not caught in test.
Solution: Consider an exception thrown in the current try/catch when got_int
is set. Also catch early exit when not using try/catch.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 15 Jun 2022 22:00:04 +0200 |
| parents | 152286f40341 |
| children | c427341dce35 |
| files | src/indent.c src/testdir/runtest.vim src/testdir/test_retab.vim src/testing.c src/version.c |
| diffstat | 5 files changed, 31 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/indent.c +++ b/src/indent.c @@ -1781,8 +1781,10 @@ ex_retab(exarg_T *eap) if (vcol >= MAXCOL) { emsg(_(e_resulting_text_too_long)); - // set got_int to break out of any loop - got_int = TRUE; + // when not inside a try/catch set got_int to break out of any + // loop + if (trylevel == 0) + got_int = TRUE; break; } if (has_mbyte)
--- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -201,6 +201,7 @@ func RunTheTest(test) endtry endif + au VimLeavePre * call EarlyExit(g:testfunc) if a:test =~ 'Test_nocatch_' " Function handles errors itself. This avoids skipping commands after the " error. @@ -212,9 +213,7 @@ func RunTheTest(test) endif else try - au VimLeavePre * call EarlyExit(g:testfunc) exe 'call ' . a:test - au! VimLeavePre catch /^\cskipped/ call add(s:messages, ' Skipped') call add(s:skipped, 'SKIPPED ' . a:test . ': ' . substitute(v:exception, '^\S*\s\+', '', '')) @@ -222,6 +221,7 @@ func RunTheTest(test) call add(v:errors, 'Caught exception in ' . a:test . ': ' . v:exception . ' @ ' . v:throwpoint) endtry endif + au! VimLeavePre " In case 'insertmode' was set and something went wrong, make sure it is " reset to avoid trouble with anything else.
--- a/src/testdir/test_retab.vim +++ b/src/testdir/test_retab.vim @@ -82,20 +82,34 @@ func Test_retab_error() call assert_fails('ret 80000000000000000000', 'E475:') endfunc -" FIXME: the try/catch does not catch the interrupt -func FIXME_Test_retab_endless() +func RetabLoop() + while 1 + set ts=4000 + retab 4 + endwhile +endfunc + +func Test_retab_endless() + " inside try/catch we catch the error message new call setline(1, "\t0\t") let caught = 'no' try - while 1 - set ts=4000 - retab 4 - endwhile - catch + call RetabLoop() + catch /E1240:/ let caught = v:exception endtry - call assert_notequal('no', caught) + call assert_match('E1240:', caught) + bwipe! + set tabstop& +endfunc + +func Test_nocatch_retab_endless() + " not inside try/catch an interrupt is generated to get out of loops + new + call setline(1, "\t0\t") + call assert_fails('call RetabLoop()', ['E1240:', 'Interrupted']) + bwipe! set tabstop& endfunc