mirror of
https://github.com/neovim/neovim.git
synced 2025-09-05 19:08:15 +00:00
vim-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 vim/vim#10490)
bf79a4e48d
Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
@@ -726,7 +726,7 @@ int do_cmdline(char *cmdline, LineGetter fgetline, void *cookie, int flags)
|
||||
if (cstack.cs_idx >= 0) {
|
||||
// If a sourced file or executed function ran to its end, report the
|
||||
// unclosed conditional.
|
||||
if (!got_int && !did_throw
|
||||
if (!got_int && !did_throw && !aborting()
|
||||
&& ((getline_equal(fgetline, cookie, getsourceline)
|
||||
&& !source_finished(fgetline, cookie))
|
||||
|| (getline_equal(fgetline, cookie, get_func_line)
|
||||
|
@@ -2221,6 +2221,23 @@ func Test_user_command_throw_in_function_call()
|
||||
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
|
||||
|
Reference in New Issue
Block a user