diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-02-22 22:45:10 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-02-22 22:45:10 +0100 |
| commit | 9cb577a68277d46cc1134ef1723e90ff5f1d1b5c (patch) | |
| tree | eefcd0fb53b76e9a54eaf5a3501a12c69b2b9a88 | |
| parent | 41f0895c6e3c7b921e3c102ad42be52b1be48018 (diff) | |
| download | vim-git-9cb577a68277d46cc1134ef1723e90ff5f1d1b5c.tar.gz | |
patch 8.2.2543: Vim9: a return inside try/catch does not restore properlyv8.2.2543
Problem: Vim9: a return inside try/catch does not restore exception state
properly.
Solution: When there is no ":finally" jump to ":endtry". (closes #7882)
| -rw-r--r-- | src/testdir/test_vim9_script.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9execute.c | 10 |
3 files changed, 20 insertions, 4 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index 0fb09fd81..a262bcb62 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -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 diff --git a/src/version.c b/src/version.c index 757a14dfd..235e34492 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2543, +/**/ 2542, /**/ 2541, diff --git a/src/vim9execute.c b/src/vim9execute.c index d2cc62f9a..232f0471e 100644 --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -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 |