mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
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)
This commit is contained in:
@@ -1204,7 +1204,8 @@ do_cmdline(
|
|||||||
* In Vim9 script do not give a second error, executing aborts after
|
* In Vim9 script do not give a second error, executing aborts after
|
||||||
* the first one.
|
* 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)
|
&& ((getline_equal(fgetline, cookie, getsourceline)
|
||||||
&& !source_finished(fgetline, cookie))
|
&& !source_finished(fgetline, cookie))
|
||||||
|| (getline_equal(fgetline, cookie, get_func_line)
|
|| (getline_equal(fgetline, cookie, get_func_line)
|
||||||
|
@@ -2247,6 +2247,23 @@ func Test_user_command_throw_in_function_call()
|
|||||||
unlet g:caught
|
unlet g:caught
|
||||||
endfunc
|
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
|
" Test for using throw in a called function with following endtry {{{1
|
||||||
func Test_user_command_function_call_with_endtry()
|
func Test_user_command_function_call_with_endtry()
|
||||||
let lines =<< trim END
|
let lines =<< trim END
|
||||||
|
@@ -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 */
|
||||||
|
/**/
|
||||||
|
5027,
|
||||||
/**/
|
/**/
|
||||||
5026,
|
5026,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user