mirror of
https://github.com/vim/vim.git
synced 2025-07-04 23:07:33 -04:00
patch 8.2.2543: Vim9: a return inside try/catch does not restore properly
Problem: Vim9: a return inside try/catch does not restore exception state properly. Solution: When there is no ":finally" jump to ":endtry". (closes #7882)
This commit is contained in:
parent
41f0895c6e
commit
9cb577a682
@ -589,6 +589,18 @@ def Test_try_catch_throw()
|
||||
assert_equal(4, ReturnInFinally())
|
||||
enddef
|
||||
|
||||
def Test_nocatch_return_in_try()
|
||||
# return in try block returns normally
|
||||
def ReturnInTry(): string
|
||||
try
|
||||
return '"some message"'
|
||||
catch
|
||||
endtry
|
||||
return 'not reached'
|
||||
enddef
|
||||
exe 'echoerr ' .. ReturnInTry()
|
||||
enddef
|
||||
|
||||
def Test_cnext_works_in_catch()
|
||||
var lines =<< trim END
|
||||
vim9script
|
||||
|
@ -750,6 +750,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
2543,
|
||||
/**/
|
||||
2542,
|
||||
/**/
|
||||
|
@ -2517,11 +2517,13 @@ call_def_function(
|
||||
trycmd = ((trycmd_T *)trystack->ga_data)
|
||||
+ trystack->ga_len - 1;
|
||||
if (trycmd != NULL
|
||||
&& trycmd->tcd_frame_idx == ectx.ec_frame_idx
|
||||
&& trycmd->tcd_finally_idx != 0)
|
||||
&& trycmd->tcd_frame_idx == ectx.ec_frame_idx)
|
||||
{
|
||||
// jump to ":finally" once
|
||||
ectx.ec_iidx = trycmd->tcd_finally_idx;
|
||||
// jump to ":finally" or ":endtry"
|
||||
if (trycmd->tcd_finally_idx != 0)
|
||||
ectx.ec_iidx = trycmd->tcd_finally_idx;
|
||||
else
|
||||
ectx.ec_iidx = trycmd->tcd_endtry_idx;
|
||||
trycmd->tcd_return = TRUE;
|
||||
}
|
||||
else
|
||||
|
Loading…
x
Reference in New Issue
Block a user