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.
diff --git a/src/indent.c b/src/indent.c
index f197027..af23757 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1781,8 +1781,10 @@
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)
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index db6797d..c7d5704 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -201,6 +201,7 @@
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 @@
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 @@
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.
diff --git a/src/testdir/test_retab.vim b/src/testdir/test_retab.vim
index 34ab7e1..2d96042 100644
--- a/src/testdir/test_retab.vim
+++ b/src/testdir/test_retab.vim
@@ -82,20 +82,34 @@
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
diff --git a/src/testing.c b/src/testing.c
index 23ab98f..c49df4b 100644
--- a/src/testing.c
+++ b/src/testing.c
@@ -742,6 +742,7 @@
suppress_errthrow = FALSE;
in_assert_fails = FALSE;
did_emsg = FALSE;
+ got_int = FALSE;
msg_col = 0;
need_wait_return = FALSE;
emsg_on_display = FALSE;
diff --git a/src/version.c b/src/version.c
index 3e64ae4..2f61521 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5102,
+/**/
5101,
/**/
5100,