mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-05 19:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1469: deferred functions not called from autocommands

Browse Source 
Problem:    Deferred functions not called from autocommands.
Solution:   Also go through the funccal_stack. (closes vim/vim#12267)

960cf9119e
This commit is contained in:
zeertzjq
2023-04-19 07:59:35 +08:00
parent a11849abdf
commit a0c982671e
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3270,8 +3270,14 @@ static void handle_defer_one(funccall_T *funccal)
/// Called when exiting: call all defer functions.
void invoke_all_defer(void)
{
for (funccall_T *funccal = current_funccal; funccal != NULL; funccal = funccal->fc_caller) {
handle_defer_one(funccal);
for (funccal_entry_T *fce = funccal_stack; fce != NULL; fce = fce->next) {
for (funccall_T *fc = fce->top_funccal; fc != NULL; fc = fc->fc_caller) {
handle_defer_one(fc);
}
}
for (funccall_T *fc = current_funccal; fc != NULL; fc = fc->fc_caller) {
handle_defer_one(fc);
}
}

29
test/old/testdir/test_user_func.vim
View File

@@ -661,6 +661,35 @@ func Test_defer_quitall_def()
call delete('XQuitallDefThree')
endfunc
func Test_defer_quitall_autocmd()
let lines =<< trim END
autocmd User DeferAutocmdThree qa!
func DeferLevelTwo()
call writefile(['text'], 'XQuitallAutocmdTwo', 'D')
doautocmd User DeferAutocmdThree
endfunc
autocmd User DeferAutocmdTwo ++nested call DeferLevelTwo()
" def DeferLevelOne()
func DeferLevelOne()
call writefile(['text'], 'XQuitallAutocmdOne', 'D')
doautocmd User DeferAutocmdTwo
" enddef
endfunc
autocmd User DeferAutocmdOne ++nested call DeferLevelOne()
doautocmd User DeferAutocmdOne
END
call writefile(lines, 'XdeferQuitallAutocmd', 'D')
let res = system(GetVimCommand() .. ' -X -S XdeferQuitallAutocmd')
call assert_equal(0, v:shell_error)
call assert_false(filereadable('XQuitallAutocmdOne'))
call assert_false(filereadable('XQuitallAutocmdTwo'))
endfunc
func Test_defer_quitall_in_expr_func()
throw 'Skipped: Vim9 script is N/A'
let lines =<< trim END