diff options
| -rw-r--r-- | src/nvim/eval/userfunc.c | 15 | ||||
| -rw-r--r-- | test/old/testdir/test_user_func.vim | 26 |
2 files changed, 41 insertions, 0 deletions
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c index ca98aad6bc..f789c53870 100644 --- a/src/nvim/eval/userfunc.c +++ b/src/nvim/eval/userfunc.c @@ -3296,8 +3296,23 @@ static void handle_defer_one(funccall_T *funccal) char *name = dr->dr_name; dr->dr_name = NULL; + // If the deferred function is called after an exception, then only the + // first statement in the function will be executed. Save and restore + // the try/catch/throw exception state. + const int save_trylevel = trylevel; + const bool save_did_throw = did_throw; + const bool save_need_rethrow = need_rethrow; + + trylevel = 0; + did_throw = false; + need_rethrow = false; + call_func(name, -1, &rettv, dr->dr_argcount, dr->dr_argvars, &funcexe); + trylevel = save_trylevel; + did_throw = save_did_throw; + need_rethrow = save_need_rethrow; + tv_clear(&rettv); xfree(name); for (int i = dr->dr_argcount - 1; i >= 0; i--) { diff --git a/test/old/testdir/test_user_func.vim b/test/old/testdir/test_user_func.vim index dc36ab98cb..ee1fd4ec5b 100644 --- a/test/old/testdir/test_user_func.vim +++ b/test/old/testdir/test_user_func.vim @@ -793,5 +793,31 @@ func Test_defer_wrong_arguments() call v9.CheckScriptFailure(lines, 'E1013: Argument 1: type mismatch, expected string but got number') endfunc +" Test for calling a deferred function after an exception +func Test_defer_after_exception() + let g:callTrace = [] + func Defer() + let g:callTrace += ['a'] + let g:callTrace += ['b'] + let g:callTrace += ['c'] + let g:callTrace += ['d'] + endfunc + + func Foo() + defer Defer() + throw "TestException" + endfunc + + try + call Foo() + catch /TestException/ + let g:callTrace += ['e'] + endtry + call assert_equal(['a', 'b', 'c', 'd', 'e'], g:callTrace) + + delfunc Defer + delfunc Foo + unlet g:callTrace +endfunc " vim: shiftwidth=2 sts=2 expandtab |