patch 8.2.5027: error for missing :endif when an exception was thrown
Problem: Error for missing :endif when an exception was thrown. (Dani
Dickstein)
Solution: Do not give an error when aborting. (closes #10490)
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 048c224..cbf7505 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -1204,7 +1204,8 @@
* In Vim9 script do not give a second error, executing aborts after
* the first one.
*/
- if (!got_int && !did_throw && !(did_emsg && in_vim9script())
+ if (!got_int && !did_throw && !aborting()
+ && !(did_emsg && in_vim9script())
&& ((getline_equal(fgetline, cookie, getsourceline)
&& !source_finished(fgetline, cookie))
|| (getline_equal(fgetline, cookie, get_func_line)
diff --git a/src/testdir/test_trycatch.vim b/src/testdir/test_trycatch.vim
index 69c7db0..aa42205 100644
--- a/src/testdir/test_trycatch.vim
+++ b/src/testdir/test_trycatch.vim
@@ -2247,6 +2247,23 @@
unlet g:caught
endfunc
+" Test that after reporting an uncaught exception there is no error for a
+" missing :endif
+func Test_after_exception_no_endif_error()
+ function Throw()
+ throw "Failure"
+ endfunction
+
+ function Foo()
+ if 1
+ call Throw()
+ endif
+ endfunction
+ call assert_fails('call Foo()', ['E605:', 'E605:'])
+ delfunc Throw
+ delfunc Foo
+endfunc
+
" Test for using throw in a called function with following endtry {{{1
func Test_user_command_function_call_with_endtry()
let lines =<< trim END
diff --git a/src/version.c b/src/version.c
index 47eaf6b..3cc224e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5027,
+/**/
5026,
/**/
5025,