mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-08 02:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.0397: :defer not tested with exceptions and ":qa!"

Browse Source 
Problem:    :defer not tested with exceptions and ":qa!".
Solution:   Test :defer works when exceptions are thrown and when ":qa!" is
            used.  Invoke the deferred calls on exit.

58779858fb

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq
2023-04-16 11:37:41 +08:00
parent 335bef0c21
commit 7b05ddbb72
3 changed files with 66 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/eval/userfunc.c
View File

@@ -1176,7 +1176,7 @@ void call_user_func(ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rett
}
// Invoke functions added with ":defer".
handle_defer();
handle_defer_one(current_funccal);
RedrawingDisabled--;
@@ -3174,10 +3174,10 @@ void add_defer(char *name, int argcount_arg, typval_T *argvars)
}
/// Invoked after a function has finished: invoke ":defer" functions.
static void handle_defer(void)
static void handle_defer_one(funccall_T *funccal)
{
for (int idx = current_funccal->fc_defer.ga_len - 1; idx >= 0; idx--) {
defer_T *dr = ((defer_T *)current_funccal->fc_defer.ga_data) + idx;
for (int idx = funccal->fc_defer.ga_len - 1; idx >= 0; idx--) {
defer_T *dr = ((defer_T *)funccal->fc_defer.ga_data) + idx;
funcexe_T funcexe = { .fe_evaluate = true };
typval_T rettv;
rettv.v_type = VAR_UNKNOWN; // tv_clear() uses this
@@ -3188,7 +3188,15 @@ static void handle_defer(void)
tv_clear(&dr->dr_argvars[i]);
}
}
ga_clear(&current_funccal->fc_defer);
ga_clear(&funccal->fc_defer);
}
/// Called when exiting: call all defer functions.
void invoke_all_defer(void)
{
for (funccall_T *funccal = current_funccal; funccal != NULL; funccal = funccal->caller) {
handle_defer_one(funccal);
}
}
/// ":1,25call func(arg1, arg2)" function call.

4
src/nvim/main.c
View File

@@ -30,6 +30,7 @@
#include "nvim/eval.h"
#include "nvim/eval/typval.h"
#include "nvim/eval/typval_defs.h"
#include "nvim/eval/userfunc.h"
#include "nvim/event/multiqueue.h"
#include "nvim/event/stream.h"
#include "nvim/ex_cmds.h"
@@ -693,6 +694,9 @@ void getout(int exitval)
// Position the cursor on the last screen line, below all the text
ui_cursor_goto(Rows - 1, 0);
// Invoked all deferred functions in the function stack.
invoke_all_defer();
// Optionally print hashtable efficiency.
hash_debug_results();