Skip to content

Commit

Permalink
patch 9.0.1470: deferred functions invoked in unexpected order
Browse files Browse the repository at this point in the history
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 #12278)
  • Loading branch information
zeertzjq authored and brammool committed Apr 19, 2023
1 parent 960cf91 commit 1be4b81
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 14 deletions.
38 changes: 27 additions & 11 deletions src/testdir/test_user_func.vim
Original file line number Diff line number Diff line change
Expand Up @@ -704,29 +704,45 @@ endfunc

func Test_defer_quitall_autocmd()
let lines =<< trim END
autocmd User DeferAutocmdThree qa!
func DeferLevelFive()
defer writefile(['5'], 'XQuitallAutocmd', 'a')
qa!
endfunc

func DeferLevelTwo()
call writefile(['text'], 'XQuitallAutocmdTwo', 'D')
doautocmd User DeferAutocmdThree
autocmd User DeferAutocmdFive call DeferLevelFive()

def DeferLevelFour()
defer writefile(['4'], 'XQuitallAutocmd', 'a')
doautocmd User DeferAutocmdFive
enddef

func DeferLevelThree()
defer writefile(['3'], 'XQuitallAutocmd', 'a')
call DeferLevelFour()
endfunc

autocmd User DeferAutocmdTwo ++nested call DeferLevelTwo()
autocmd User DeferAutocmdThree ++nested call DeferLevelThree()

def DeferLevelOne()
call writefile(['text'], 'XQuitallAutocmdOne', 'D')
doautocmd User DeferAutocmdTwo
def DeferLevelTwo()
defer writefile(['2'], 'XQuitallAutocmd', 'a')
doautocmd User DeferAutocmdThree
enddef

func DeferLevelOne()
defer writefile(['1'], 'XQuitallAutocmd', 'a')
call DeferLevelTwo()
endfunc

autocmd User DeferAutocmdOne ++nested call DeferLevelOne()

doautocmd User DeferAutocmdOne
END
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_false(filereadable('XQuitallAutocmdOne'))
call assert_false(filereadable('XQuitallAutocmdTwo'))
call assert_equal(['5', '4', '3', '2', '1'], readfile('XQuitallAutocmd'))

call delete('XQuitallAutocmd')
endfunc

func Test_defer_quitall_in_expr_func()
Expand Down
6 changes: 3 additions & 3 deletions src/userfunc.c
Original file line number Diff line number Diff line change
Expand Up @@ -6144,12 +6144,12 @@ invoke_funccall_defer(funccall_T *fc)
void
invoke_all_defer(void)
{
for (funccall_T *fc = current_funccal; fc != NULL; fc = fc->fc_caller)
invoke_funccall_defer(fc);

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)
invoke_funccall_defer(fc);

for (funccall_T *fc = current_funccal; fc != NULL; fc = fc->fc_caller)
invoke_funccall_defer(fc);
}

/*
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1470,
/**/
1469,
/**/
Expand Down

0 comments on commit 1be4b81

Please sign in to comment.