mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
vim-patch:8.2.3416: second error is reported while exception is being thrown
Problem: Second error is reported while exception is being thrown.
Solution: Do not check for trailing characters when already aborting.
(closes vim/vim#8842)
36f691f5f1
This commit is contained in:
parent
4dc09f38ee
commit
b6026337f2
@ -3018,7 +3018,7 @@ void ex_call(exarg_T *eap)
|
||||
}
|
||||
|
||||
// When inside :try we need to check for following "| catch".
|
||||
if (!failed || eap->cstack->cs_trylevel > 0) {
|
||||
if (!aborting() && (!failed || eap->cstack->cs_trylevel > 0)) {
|
||||
// Check for trailing illegal characters and a following command.
|
||||
if (!ends_excmd(*arg)) {
|
||||
if (!failed) {
|
||||
|
@ -1996,5 +1996,29 @@ func Test_reload_in_try_catch()
|
||||
call delete('Xreload')
|
||||
endfunc
|
||||
|
||||
" Test for using throw in a called function with following error {{{1
|
||||
func Test_user_command_throw_in_function_call()
|
||||
let lines =<< trim END
|
||||
function s:get_dict() abort
|
||||
throw 'my_error'
|
||||
endfunction
|
||||
|
||||
try
|
||||
call s:get_dict().foo()
|
||||
catch /my_error/
|
||||
let caught = 'yes'
|
||||
catch
|
||||
let caught = 'no'
|
||||
endtry
|
||||
call assert_equal('yes', caught)
|
||||
END
|
||||
call writefile(lines, 'XtestThrow')
|
||||
source XtestThrow
|
||||
|
||||
call delete('XtestThrow')
|
||||
unlet g:caught
|
||||
endfunc
|
||||
|
||||
|
||||
" Modeline {{{1
|
||||
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
|
||||
|
Loading…
Reference in New Issue
Block a user