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

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)

https://github.com/vim/vim/commit/1be4b81bfb3d7edf0e2ae41711d429e8fa5e0555

2 files changed, 33 insertions, 15 deletions

diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c
index 4cb2f9bd2b..51e109fdfb 100644
--- a/src/nvim/eval/userfunc.c
+++ b/src/nvim/eval/userfunc.c
@@ -3270,15 +3270,15 @@ static void handle_defer_one(funccall_T *funccal)
 /// Called when exiting: call all defer functions.
 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 (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);
-  }
 }
 
 /// ":1,25call func(arg1, arg2)" function call.
diff --git a/test/old/testdir/test_user_func.vim b/test/old/testdir/test_user_func.vim
index 5f6229258d..dc36ab98cb 100644
--- a/test/old/testdir/test_user_func.vim
+++ b/test/old/testdir/test_user_func.vim
@@ -663,20 +663,37 @@ endfunc
 
 func Test_defer_quitall_autocmd()
   let lines =<< trim END
-      autocmd User DeferAutocmdThree qa!
+      func DeferLevelFive()
+        defer writefile(['5'], 'XQuitallAutocmd', 'a')
+        qa!
+      endfunc
 
+      autocmd User DeferAutocmdFive call DeferLevelFive()
+
+      " def DeferLevelFour()
+      func DeferLevelFour()
+        defer writefile(['4'], 'XQuitallAutocmd', 'a')
+        doautocmd User DeferAutocmdFive
+      " enddef
+      endfunc
+
+      func DeferLevelThree()
+        defer writefile(['3'], 'XQuitallAutocmd', 'a')
+        call DeferLevelFour()
+      endfunc
+
+      autocmd User DeferAutocmdThree ++nested call DeferLevelThree()
+
+      " def DeferLevelTwo()
       func DeferLevelTwo()
-        call writefile(['text'], 'XQuitallAutocmdTwo', 'D')
+        defer writefile(['2'], 'XQuitallAutocmd', 'a')
         doautocmd User DeferAutocmdThree
+      " enddef
       endfunc
 
-      autocmd User DeferAutocmdTwo ++nested call DeferLevelTwo()
-
-      " def DeferLevelOne()
       func DeferLevelOne()
-        call writefile(['text'], 'XQuitallAutocmdOne', 'D')
-        doautocmd User DeferAutocmdTwo
-      " enddef
+        defer writefile(['1'], 'XQuitallAutocmd', 'a')
+        call DeferLevelTwo()
       endfunc
 
       autocmd User DeferAutocmdOne ++nested call DeferLevelOne()
@@ -684,10 +701,11 @@ func Test_defer_quitall_autocmd()
       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()