Trigger TabNew before TabEnter

3 files changed, 26 insertions, 19 deletions

diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 3a24f194c1..a7e98e7f04 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -6290,10 +6290,8 @@ void ex_splitview(exarg_T *eap)
   if (eap->cmdidx == CMD_tabedit
       || eap->cmdidx == CMD_tabfind
       || eap->cmdidx == CMD_tabnew) {
-    if (win_new_tabpage(cmdmod.tab != 0 ? cmdmod.tab
-            : eap->addr_count == 0 ? 0
-            : (int)eap->line2 + 1) != FAIL) {
-      apply_autocmds(EVENT_TABNEW, eap->arg, eap->arg,  FALSE, curbuf); 
+    if (win_new_tabpage(cmdmod.tab != 0 ? cmdmod.tab : eap->addr_count == 0
+                        ? 0 : (int)eap->line2 + 1, eap->arg) != FAIL) {
       do_exedit(eap, old_curwin);
       apply_autocmds(EVENT_TABNEWENTERED, NULL, NULL, FALSE, curbuf);
 
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 39106a7b8d..b79aa366e5 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -248,7 +248,7 @@ newwindow:
       /* First create a new tab with the window, then go back to
        * the old tab and close the window there. */
       wp = curwin;
-      if (win_new_tabpage((int)Prenum) == OK
+      if (win_new_tabpage((int)Prenum, NULL) == OK
           && valid_tabpage(oldtab)) {
         newtab = curtab;
         goto_tabpage_tp(oldtab, TRUE, TRUE);
@@ -2952,14 +2952,15 @@ void free_tabpage(tabpage_T *tp)
   xfree(tp);
 }
 
-/*
- * Create a new Tab page with one window.
- * It will edit the current buffer, like after ":split".
- * When "after" is 0 put it just after the current Tab page.
- * Otherwise put it just before tab page "after".
- * Return FAIL or OK.
- */
-int win_new_tabpage(int after)
+/// Create a new tabpage with one window.
+///
+/// It will edit the current buffer, like after :split.
+///
+/// @param after Put new tabpage after tabpage "after", or after the current
+///              tabpage in case of 0.
+/// @param filename Will be passed to apply_autocmds().
+/// @return Was the new tabpage created successfully? FAIL or OK.
+int win_new_tabpage(int after, char_u *filename)
 {
   tabpage_T   *tp = curtab;
   tabpage_T   *newtp;
@@ -2999,10 +3000,12 @@ int win_new_tabpage(int after)
     newtp->tp_topframe = topframe;
     last_status(FALSE);
 
-
     redraw_all_later(CLEAR);
-    apply_autocmds(EVENT_WINENTER, NULL, NULL, FALSE, curbuf);
-    apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
+
+    apply_autocmds(EVENT_TABNEW, filename, filename, false, curbuf);
+    apply_autocmds(EVENT_WINENTER, NULL, NULL, false, curbuf);
+    apply_autocmds(EVENT_TABENTER, NULL, NULL, false, curbuf);
+
     return OK;
   }
 
@@ -3023,7 +3026,7 @@ int may_open_tabpage(void)
   if (n != 0) {
     cmdmod.tab = 0;         /* reset it to avoid doing it twice */
     postponed_split_tab = 0;
-    return win_new_tabpage(n);
+    return win_new_tabpage(n, NULL);
   }
   return FAIL;
 }
@@ -3047,9 +3050,11 @@ int make_tabpages(int maxcount)
    */
   block_autocmds();
 
-  for (todo = count - 1; todo > 0; --todo)
-    if (win_new_tabpage(0) == FAIL)
+  for (todo = count - 1; todo > 0; --todo) {
+    if (win_new_tabpage(0, NULL) == FAIL) {
       break;
+    }
+  }
 
   unblock_autocmds();
 
diff --git a/test/functional/legacy/062_tab_pages_spec.lua b/test/functional/legacy/062_tab_pages_spec.lua
index f1c8b8d58b..c3cdcac471 100644
--- a/test/functional/legacy/062_tab_pages_spec.lua
+++ b/test/functional/legacy/062_tab_pages_spec.lua
@@ -139,6 +139,7 @@ describe('tab pages', function()
 	  autocmd TabLeave * :call add(g:r, 'TabLeave')
 	  autocmd WinLeave * :call add(g:r, 'WinLeave')
 	  autocmd BufLeave * :call add(g:r, 'BufLeave')
+	  autocmd TabNew   * :call add(g:r, 'TabNew')
           let t:a='a'
           C tab split
           let t:a='b'
@@ -185,11 +186,13 @@ describe('tab pages', function()
       === tab split ===
       WinLeave
       TabLeave
+      TabNew
       WinEnter
       TabEnter
       === tabnew ===
       WinLeave
       TabLeave
+      TabNew
       WinEnter
       TabEnter
       BufLeave
@@ -222,6 +225,7 @@ describe('tab pages', function()
       === tabnew ===
       WinLeave
       TabLeave
+      TabNew
       WinEnter
       TabEnter
       BufLeave