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 f197027697e06ade2873bd9f9af86948e57dd2a6..af23757a4a4c81359c6668eccafa4559b65f3704 100644 (file)
--- 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)

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index db6797d1b00a75f5f270652549e96fc6e46f3111..c7d5704e9a01632f6dcd65f6a46ff9aece66a91b 100644 (file)
--- 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.

diff --git a/src/testdir/test_retab.vim b/src/testdir/test_retab.vim
index 34ab7e1f99e4c1033f54c092bfc4e99689db4406..2d96042dc1984b8137dff823482e03fe51be9dcd 100644 (file)
--- 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

diff --git a/src/testing.c b/src/testing.c
index 23ab98f5c1b04de7da5a3287b74038f45b76f116..c49df4b494d8bd34527a4b0409652e4859f51f27 100644 (file)
--- a/src/testing.c
+++ b/src/testing.c
@@ -742,6 +742,7 @@ theend:
     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 3e64ae468d23a4616dd1da6c6bffa0d897595d78..2f6152130d805e1f140a63ed6454d5b1a00e1be5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5102,
 /**/
     5101,
 /**/