forked from aniani/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 #8842)
This commit is contained in:
@@ -2224,5 +2224,29 @@ func Test_user_command_try_catch()
|
|||||||
unlet g:caught
|
unlet g:caught
|
||||||
endfunc
|
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
|
" Modeline {{{1
|
||||||
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
|
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
|
||||||
|
@@ -5012,7 +5012,7 @@ ex_call(exarg_T *eap)
|
|||||||
clear_evalarg(&evalarg, eap);
|
clear_evalarg(&evalarg, eap);
|
||||||
|
|
||||||
// When inside :try we need to check for following "| catch".
|
// 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.
|
// Check for trailing illegal characters and a following command.
|
||||||
arg = skipwhite(arg);
|
arg = skipwhite(arg);
|
||||||
|
@@ -755,6 +755,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 */
|
||||||
|
/**/
|
||||||
|
3416,
|
||||||
/**/
|
/**/
|
||||||
3415,
|
3415,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user