IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1470: deferred functions invoked in unexpected order (#23199)

Browse Source 
Problem:    Deferred functions invoked in unexpected order when using :qa and
            autocommands.
Solution:   Call deferred functions for the current funccal before using the
            stack. (closes vim/vim#12278)

1be4b81bfb
This commit is contained in:
zeertzjq 2023-04-19 22:09:48 +08:00 committed by GitHub
parent 7bf1a917b7
commit 0d7bed34a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3270,15 +3270,15 @@ static void handle_defer_one(funccall_T *funccal)
/// Called when exiting: call all defer functions. /// Called when exiting: call all defer functions.
void invoke_all_defer(void) void invoke_all_defer(void)
{ {
for (funccall_T *fc = current_funccal; fc != NULL; fc = fc->fc_caller) {
handle_defer_one(fc);
}
for (funccal_entry_T *fce = funccal_stack; fce != NULL; fce = fce->next) { 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) { for (funccall_T *fc = fce->top_funccal; fc != NULL; fc = fc->fc_caller) {
handle_defer_one(fc); handle_defer_one(fc);
} }
} }
for (funccall_T *fc = current_funccal; fc != NULL; fc = fc->fc_caller) {
handle_defer_one(fc);
}
} }
/// ":1,25call func(arg1, arg2)" function call. /// ":1,25call func(arg1, arg2)" function call.

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

@ -663,31 +663,49 @@ endfunc
func Test_defer_quitall_autocmd() func Test_defer_quitall_autocmd()
let lines =<< trim END let lines =<< trim END
autocmd User DeferAutocmdThree qa! func DeferLevelFive()
defer writefile(['5'], 'XQuitallAutocmd', 'a')
func DeferLevelTwo() qa!
call writefile(['text'], 'XQuitallAutocmdTwo', 'D')
doautocmd User DeferAutocmdThree
endfunc endfunc
autocmd User DeferAutocmdTwo ++nested call DeferLevelTwo() autocmd User DeferAutocmdFive call DeferLevelFive()
" def DeferLevelOne() " def DeferLevelFour()
func DeferLevelOne() func DeferLevelFour()
call writefile(['text'], 'XQuitallAutocmdOne', 'D') defer writefile(['4'], 'XQuitallAutocmd', 'a')
doautocmd User DeferAutocmdTwo doautocmd User DeferAutocmdFive
" enddef " enddef
endfunc endfunc
func DeferLevelThree()
defer writefile(['3'], 'XQuitallAutocmd', 'a')
call DeferLevelFour()
endfunc
autocmd User DeferAutocmdThree ++nested call DeferLevelThree()
" def DeferLevelTwo()
func DeferLevelTwo()
defer writefile(['2'], 'XQuitallAutocmd', 'a')
doautocmd User DeferAutocmdThree
" enddef
endfunc
func DeferLevelOne()
defer writefile(['1'], 'XQuitallAutocmd', 'a')
call DeferLevelTwo()
endfunc
autocmd User DeferAutocmdOne ++nested call DeferLevelOne() autocmd User DeferAutocmdOne ++nested call DeferLevelOne()
doautocmd User DeferAutocmdOne doautocmd User DeferAutocmdOne
END END
call writefile(lines, 'XdeferQuitallAutocmd', 'D') call writefile(lines, 'XdeferQuitallAutocmd', 'D')
let res = system(GetVimCommand() .. ' -X -S XdeferQuitallAutocmd') call system(GetVimCommand() .. ' -X -S XdeferQuitallAutocmd')
call assert_equal(0, v:shell_error) call assert_equal(0, v:shell_error)
call assert_false(filereadable('XQuitallAutocmdOne')) call assert_equal(['5', '4', '3', '2', '1'], readfile('XQuitallAutocmd'))
call assert_false(filereadable('XQuitallAutocmdTwo'))
call delete('XQuitallAutocmd')
endfunc endfunc
func Test_defer_quitall_in_expr_func() func Test_defer_quitall_in_expr_func()