neovim

commit 9e3640a7797bcc5f6015548842572a6ce951a861
parent 831d662ac6756cab4fed6a9b394e68933b5fe325
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Wed, 18 Oct 2023 18:27:50 +0800

vim-patch:9.0.2044: Vim9: exceptions confuse defered functions

Problem:  Vim9: exceptions confuse defered functions
Solution: save and restore exception state when calling defered
          functions

closes: vim/vim#13364
closes: vim/vim#13372

https://github.com/vim/vim/commit/0672595fd50e9ae668676a40e28ebf66d7f52392

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>

Diffstat:
M
src/nvim/eval/userfunc.c
 | 
15
+++++++++++++++
M
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
@@ -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
@@ -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