diff options
| -rw-r--r-- | src/nvim/eval.c | 18 | ||||
| -rw-r--r-- | src/nvim/testdir/test_eval_stuff.vim | 13 |
2 files changed, 22 insertions, 9 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 9c678168bb..515dd0e69f 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -21797,15 +21797,15 @@ void ex_return(exarg_T *eap) } else { tv_clear(&rettv); } - } - /* It's safer to return also on error. */ - else if (!eap->skip) { - /* - * Return unless the expression evaluation has been cancelled due to an - * aborting error, an interrupt, or an exception. - */ - if (!aborting()) - returning = do_return(eap, FALSE, TRUE, NULL); + } else if (!eap->skip) { // It's safer to return also on error. + // In return statement, cause_abort should be force_abort. + update_force_abort(); + + // Return unless the expression evaluation has been cancelled due to an + // aborting error, an interrupt, or an exception. + if (!aborting()) { + returning = do_return(eap, false, true, NULL); + } } /* When skipping or the return gets pending, advance to the next command diff --git a/src/nvim/testdir/test_eval_stuff.vim b/src/nvim/testdir/test_eval_stuff.vim new file mode 100644 index 0000000000..92e1ec5335 --- /dev/null +++ b/src/nvim/testdir/test_eval_stuff.vim @@ -0,0 +1,13 @@ +" Tests for various eval things. + +function s:foo() abort + try + return [] == 0 + catch + return 1 + endtry +endfunction + +func Test_catch_return_with_error() + call assert_equal(1, s:foo()) +endfunc |