fix: close floating windows when calling win_close()

romgrk · lewis6991 · commit 85ae04dbfd40 · 2022-02-10T15:26:40.000Z
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
@@ -395,7 +395,7 @@ void nvim_win_hide(Window window, Error *err)
   TryState tstate;
   try_enter(&tstate);
   if (tabpage == curtab) {
-    win_close(win, false);
+    win_close(win, false, false);
   } else {
     win_close_othertab(win, false, tabpage);
   }
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
@@ -846,7 +846,7 @@ void goto_buffer(exarg_T *eap, int start, int dir, int count)
     enter_cleanup(&cs);
 
     // Quitting means closing the split window, nothing else.
-    win_close(curwin, true);
+    win_close(curwin, true, false);
     swap_exists_action = SEA_NONE;
     swap_exists_did_quit = true;
 
@@ -1237,7 +1237,7 @@ int do_buffer(int action, int start, int dir, int count, int forceit)
     while (buf == curbuf
            && !(curwin->w_closing || curwin->w_buffer->b_locked > 0)
            && (!ONE_WINDOW || first_tabpage->tp_next != NULL)) {
-      if (win_close(curwin, false) == FAIL) {
+      if (win_close(curwin, false, false) == FAIL) {
         break;
       }
     }
@@ -4822,7 +4822,7 @@ void do_arg_all(int count, int forceit, int keep_tabs)
               && (first_tabpage->tp_next == NULL || !had_tab)) {
             use_firstwin = true;
           } else {
-            win_close(wp, !buf_hide(buf) && !bufIsChanged(buf));
+            win_close(wp, !buf_hide(buf) && !bufIsChanged(buf), false);
             // check if autocommands removed the next window
             if (!win_valid(wpnext)) {
               // start all over...
@@ -5013,7 +5013,7 @@ void ex_buffer_all(exarg_T *eap)
           && !ONE_WINDOW
           && !(wp->w_closing
                || wp->w_buffer->b_locked > 0)) {
-        win_close(wp, false);
+        win_close(wp, false, false);
         wpnext = firstwin;              // just in case an autocommand does
                                         // something strange with windows
         tpnext = first_tabpage;         // start all over...
@@ -5094,7 +5094,7 @@ void ex_buffer_all(exarg_T *eap)
         enter_cleanup(&cs);
 
         // User selected Quit at ATTENTION prompt; close this window.
-        win_close(curwin, true);
+        win_close(curwin, true, false);
         open_wins--;
         swap_exists_action = SEA_NONE;
         swap_exists_did_quit = true;
@@ -5136,7 +5136,7 @@ void ex_buffer_all(exarg_T *eap)
       // BufWrite Autocommands made the window invalid, start over
       wp = lastwin;
     } else if (r) {
-      win_close(wp, !buf_hide(wp->w_buffer));
+      win_close(wp, !buf_hide(wp->w_buffer), false);
       open_wins--;
       wp = lastwin;
     } else {
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
@@ -5856,7 +5856,7 @@ void ex_helpclose(exarg_T *eap)
 {
   FOR_ALL_WINDOWS_IN_TAB(win, curtab) {
     if (bt_help(win->w_buffer)) {
-      win_close(win, false);
+      win_close(win, false, eap->forceit);
       return;
     }
   }
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
@@ -6619,7 +6619,7 @@ static void ex_quit(exarg_T *eap)
     }
     not_exiting();
     // close window; may free buffer
-    win_close(wp, !buf_hide(wp->w_buffer) || eap->forceit);
+    win_close(wp, !buf_hide(wp->w_buffer) || eap->forceit, eap->forceit);
   }
 }
 
@@ -6734,7 +6734,7 @@ void ex_win_close(int forceit, win_T *win, tabpage_T *tp)
 
   // free buffer when not hiding it or when it's a scratch buffer
   if (tp == NULL) {
-    win_close(win, !need_hide && !buf_hide(buf));
+    win_close(win, !need_hide && !buf_hide(buf), forceit);
   } else {
     win_close_othertab(win, !need_hide && !buf_hide(buf), tp);
   }
@@ -6898,7 +6898,7 @@ static void ex_hide(exarg_T *eap)
   // ":hide" or ":hide | cmd": hide current window
   if (!eap->skip) {
     if (eap->addr_count == 0) {
-      win_close(curwin, false);  // don't free buffer
+      win_close(curwin, false, eap->forceit);  // don't free buffer
     } else {
       int winnr = 0;
       win_T *win = NULL;
@@ -6913,7 +6913,7 @@ static void ex_hide(exarg_T *eap)
       if (win == NULL) {
         win = lastwin;
       }
-      win_close(win, false);
+      win_close(win, false, eap->forceit);
     }
   }
 }
@@ -6971,7 +6971,7 @@ static void ex_exit(exarg_T *eap)
     }
     not_exiting();
     // Quit current window, may free the buffer.
-    win_close(curwin, !buf_hide(curwin->w_buffer));
+    win_close(curwin, !buf_hide(curwin->w_buffer), eap->forceit);
   }
 }
 
@@ -7572,7 +7572,7 @@ void do_exedit(exarg_T *eap, win_T *old_curwin)
           // Reset the error/interrupt/exception state here so that
           // aborting() returns FALSE when closing a window.
           enter_cleanup(&cs);
-          win_close(curwin, !need_hide && !buf_hide(curbuf));
+          win_close(curwin, !need_hide && !buf_hide(curbuf), false);
 
           // Restore the error/interrupt/exception state if not
           // discarded by a new aborting error, interrupt, or
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
@@ -6563,7 +6563,7 @@ static int open_cmdwin(void)
     set_bufref(&bufref, curbuf);
     win_goto(old_curwin);
     if (win_valid(wp) && wp != curwin) {
-      win_close(wp, true);
+      win_close(wp, true, false);
     }
 
     // win_close() may have already wiped the buffer when 'bh' is
diff --git a/src/nvim/main.c b/src/nvim/main.c
@@ -1560,7 +1560,7 @@ static void edit_buffers(mparm_T *parmp, char_u *cwd)
 
   // When w_arg_idx is -1 remove the window (see create_windows()).
   if (curwin->w_arg_idx == -1) {
-    win_close(curwin, true);
+    win_close(curwin, true, false);
     advance = false;
   }
 
@@ -1572,7 +1572,7 @@ static void edit_buffers(mparm_T *parmp, char_u *cwd)
     // When w_arg_idx is -1 remove the window (see create_windows()).
     if (curwin->w_arg_idx == -1) {
       arg_idx++;
-      win_close(curwin, true);
+      win_close(curwin, true, false);
       advance = false;
       continue;
     }
@@ -1619,7 +1619,7 @@ static void edit_buffers(mparm_T *parmp, char_u *cwd)
           did_emsg = FALSE;             // avoid hit-enter prompt
           getout(1);
         }
-        win_close(curwin, true);
+        win_close(curwin, true, false);
         advance = false;
       }
       if (arg_idx == GARGCOUNT - 1) {
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
@@ -3022,7 +3022,7 @@ static void qf_jump_newwin(qf_info_T *qi, int dir, int errornr, int forceit, boo
 
   if (retval != OK) {
     if (opened_window) {
-      win_close(curwin, true);          // Close opened window
+      win_close(curwin, true, false);          // Close opened window
     }
     if (qf_ptr != NULL && qf_ptr->qf_fnum != 0) {
       // Couldn't open file, so put index back where it was.  This could
@@ -3577,7 +3577,7 @@ void ex_cclose(exarg_T *eap)
   // Find existing quickfix window and close it.
   win = qf_find_win(qi);
   if (win != NULL) {
-    win_close(win, false);
+    win_close(win, false, false);
   }
 }
 
@@ -3651,7 +3651,7 @@ static int qf_open_new_cwindow(qf_info_T *qi, int height)
   // win_split, so add a check to ensure that the win is still here
   if (IS_LL_STACK(qi) && !win_valid(win)) {
     // close the window that was supposed to be for the loclist
-    win_close(curwin, false);
+    win_close(curwin, false, false);
     return FAIL;
   }
 
@@ -5767,7 +5767,7 @@ static void wipe_dummy_buffer(buf_T *buf, char_u *dirname_start)
     if (firstwin->w_next != NULL) {
       for (win_T *wp = firstwin; wp != NULL; wp = wp->w_next) {
         if (wp->w_buffer == buf) {
-          if (win_close(wp, false) == OK) {
+          if (win_close(wp, false, false) == OK) {
             did_one = true;
           }
           break;
diff --git a/src/nvim/tag.c b/src/nvim/tag.c
@@ -2960,7 +2960,7 @@ static int jumpto_tag(const char_u *lbuf_arg, int forceit, int keep_help)
   } else {
     RedrawingDisabled--;
     if (postponed_split) {              // close the window
-      win_close(curwin, false);
+      win_close(curwin, false, false);
       postponed_split = 0;
     }
   }
diff --git a/src/nvim/window.c b/src/nvim/window.c
@@ -304,7 +304,7 @@ void do_window(int nchar, long Prenum, int xchar)
         newtab = curtab;
         goto_tabpage_tp(oldtab, true, true);
         if (curwin == wp) {
-          win_close(curwin, false);
+          win_close(curwin, false, false);
         }
         if (valid_tabpage(newtab)) {
           goto_tabpage_tp(newtab, true, true);
@@ -449,7 +449,7 @@ void do_window(int nchar, long Prenum, int xchar)
         RESET_BINDING(curwin);
         if (do_ecmd(0, ptr, NULL, NULL, ECMD_LASTL, ECMD_HIDE, NULL) == FAIL) {
           // Failed to open the file, close the window opened for it.
-          win_close(curwin, false);
+          win_close(curwin, false, false);
           goto_tabpage_win(oldtab, oldwin);
         } else if (nchar == 'F' && lnum >= 0) {
           curwin->w_cursor.lnum = lnum;
@@ -2290,7 +2290,7 @@ void close_windows(buf_T *buf, int keep_curwin)
   for (win_T *wp = firstwin; wp != NULL && !ONE_WINDOW;) {
     if (wp->w_buffer == buf && (!keep_curwin || wp != curwin)
         && !(wp->w_closing || wp->w_buffer->b_locked > 0)) {
-      if (win_close(wp, false) == FAIL) {
+      if (win_close(wp, false, false) == FAIL) {
         // If closing the window fails give up, to avoid looping forever.
         break;
       }
@@ -2368,6 +2368,22 @@ bool last_nonfloat(win_T *wp) FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
   return wp != NULL && firstwin == wp && !(wp->w_next && !wp->w_floating);
 }
 
+/// Check if floating windows can be closed.
+///
+/// @return true if all floating windows can be closed
+static bool can_close_floating_windows(tabpage_T *tab)
+{
+  FOR_ALL_WINDOWS_IN_TAB(wp, tab) {
+    buf_T *buf = wp->w_buffer;
+    int need_hide = (bufIsChanged(buf) && buf->b_nwindows <= 1);
+
+    if (need_hide && !buf_hide(buf)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 /// Close the possibly last window in a tab page.
 ///
 /// @param  win          window to close
@@ -2432,7 +2448,7 @@ static bool close_last_window_tabpage(win_T *win, bool free_buf, tabpage_T *prev
 //
 // Called by :quit, :close, :xit, :wq and findtag().
 // Returns FAIL when the window was not closed.
-int win_close(win_T *win, bool free_buf)
+int win_close(win_T *win, bool free_buf, bool force)
 {
   win_T *wp;
   bool other_buffer = false;
@@ -2462,9 +2478,18 @@ int win_close(win_T *win, bool free_buf)
   }
   if ((firstwin == win && lastwin_nofloating() == win)
       && lastwin->w_floating) {
-    // TODO(bfredl): we might close the float also instead
-    emsg(e_floatonly);
-    return FAIL;
+    if (force || can_close_floating_windows(curtab)) {
+      win_T *nextwp;
+      for (win_T *wpp = firstwin; wpp != NULL; wpp = nextwp) {
+        nextwp = wpp->w_next;
+        if (wpp->w_floating) {
+          win_close(wpp, free_buf, force);
+        }
+      }
+    } else {
+      emsg(e_floatonly);
+      return FAIL;
+    }
   }
 
   // When closing the last window in a tab page first go to another tab page
@@ -3611,7 +3636,9 @@ void close_others(int message, int forceit)
         continue;
       }
     }
-    win_close(wp, !buf_hide(wp->w_buffer) && !bufIsChanged(wp->w_buffer));
+    win_close(wp,
+              !buf_hide(wp->w_buffer) && !bufIsChanged(wp->w_buffer),
+              false);
   }
 
   if (message && !ONE_WINDOW) {
diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua
@@ -417,6 +417,28 @@ describe('float window', function()
     eq(winids, eval('winids'))
   end)
 
+  it('closed when the last non-float window is closed', function()
+    local tabpage = exec_lua([[
+      vim.cmd('edit ./src/nvim/main.c')
+      vim.cmd('tabedit %')
+
+      local buf = vim.api.nvim_create_buf(false, true)
+      local win = vim.api.nvim_open_win(buf, false, {
+        relative = 'win',
+        row = 1,
+        col = 1,
+        width = 10,
+        height = 2
+      })
+
+      vim.cmd('quit')
+
+      return vim.api.nvim_get_current_tabpage()
+    ]])
+
+    eq(1, tabpage)
+  end)
+
   local function with_ext_multigrid(multigrid)
     local screen
     before_each(function()

Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,7 @@ void nvim_win_hide(Window window, Error *err)`
`395`	`395`	`TryState tstate;`
`396`	`396`	`try_enter(&tstate);`
`397`	`397`	`if (tabpage == curtab) {`
`398`		`- win_close(win, false);`
	`398`	`+ win_close(win, false, false);`
`399`	`399`	`} else {`
`400`	`400`	`win_close_othertab(win, false, tabpage);`
`401`	`401`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5856,7 +5856,7 @@ void ex_helpclose(exarg_T *eap)`
`5856`	`5856`	`{`
`5857`	`5857`	`FOR_ALL_WINDOWS_IN_TAB(win, curtab) {`
`5858`	`5858`	`if (bt_help(win->w_buffer)) {`
`5859`		`- win_close(win, false);`
	`5859`	`+ win_close(win, false, eap->forceit);`
`5860`	`5860`	`return;`
`5861`	`5861`	`}`
`5862`	`5862`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6619,7 +6619,7 @@ static void ex_quit(exarg_T *eap)`
`6619`	`6619`	`}`
`6620`	`6620`	`not_exiting();`
`6621`	`6621`	`// close window; may free buffer`
`6622`		`- win_close(wp, !buf_hide(wp->w_buffer) \|\| eap->forceit);`
	`6622`	`+ win_close(wp, !buf_hide(wp->w_buffer) \|\| eap->forceit, eap->forceit);`
`6623`	`6623`	`}`
`6624`	`6624`	`}`
`6625`	`6625`
`@@ -6734,7 +6734,7 @@ void ex_win_close(int forceit, win_T win, tabpage_T tp)`
`6734`	`6734`
`6735`	`6735`	`// free buffer when not hiding it or when it's a scratch buffer`
`6736`	`6736`	`if (tp == NULL) {`
`6737`		`- win_close(win, !need_hide && !buf_hide(buf));`
	`6737`	`+ win_close(win, !need_hide && !buf_hide(buf), forceit);`
`6738`	`6738`	`} else {`
`6739`	`6739`	`win_close_othertab(win, !need_hide && !buf_hide(buf), tp);`
`6740`	`6740`	`}`
`@@ -6898,7 +6898,7 @@ static void ex_hide(exarg_T *eap)`
`6898`	`6898`	`// ":hide" or ":hide \| cmd": hide current window`
`6899`	`6899`	`if (!eap->skip) {`
`6900`	`6900`	`if (eap->addr_count == 0) {`
`6901`		`- win_close(curwin, false); // don't free buffer`
	`6901`	`+ win_close(curwin, false, eap->forceit); // don't free buffer`
`6902`	`6902`	`} else {`
`6903`	`6903`	`int winnr = 0;`
`6904`	`6904`	`win_T *win = NULL;`
`@@ -6913,7 +6913,7 @@ static void ex_hide(exarg_T *eap)`
`6913`	`6913`	`if (win == NULL) {`
`6914`	`6914`	`win = lastwin;`
`6915`	`6915`	`}`
`6916`		`- win_close(win, false);`
	`6916`	`+ win_close(win, false, eap->forceit);`
`6917`	`6917`	`}`
`6918`	`6918`	`}`
`6919`	`6919`	`}`
`@@ -6971,7 +6971,7 @@ static void ex_exit(exarg_T *eap)`
`6971`	`6971`	`}`
`6972`	`6972`	`not_exiting();`
`6973`	`6973`	`// Quit current window, may free the buffer.`
`6974`		`- win_close(curwin, !buf_hide(curwin->w_buffer));`
	`6974`	`+ win_close(curwin, !buf_hide(curwin->w_buffer), eap->forceit);`
`6975`	`6975`	`}`
`6976`	`6976`	`}`
`6977`	`6977`
`@@ -7572,7 +7572,7 @@ void do_exedit(exarg_T eap, win_T old_curwin)`
`7572`	`7572`	`// Reset the error/interrupt/exception state here so that`
`7573`	`7573`	`// aborting() returns FALSE when closing a window.`
`7574`	`7574`	`enter_cleanup(&cs);`
`7575`		`- win_close(curwin, !need_hide && !buf_hide(curbuf));`
	`7575`	`+ win_close(curwin, !need_hide && !buf_hide(curbuf), false);`
`7576`	`7576`
`7577`	`7577`	`// Restore the error/interrupt/exception state if not`
`7578`	`7578`	`// discarded by a new aborting error, interrupt, or`
Original file line number	Diff line number	Diff line change
`@@ -6563,7 +6563,7 @@ static int open_cmdwin(void)`
`6563`	`6563`	`set_bufref(&bufref, curbuf);`
`6564`	`6564`	`win_goto(old_curwin);`
`6565`	`6565`	`if (win_valid(wp) && wp != curwin) {`
`6566`		`- win_close(wp, true);`
	`6566`	`+ win_close(wp, true, false);`
`6567`	`6567`	`}`
`6568`	`6568`
`6569`	`6569`	`// win_close() may have already wiped the buffer when 'bh' is`
Original file line number	Diff line number	Diff line change
`@@ -1560,7 +1560,7 @@ static void edit_buffers(mparm_T parmp, char_u cwd)`
`1560`	`1560`
`1561`	`1561`	`// When w_arg_idx is -1 remove the window (see create_windows()).`
`1562`	`1562`	`if (curwin->w_arg_idx == -1) {`
`1563`		`- win_close(curwin, true);`
	`1563`	`+ win_close(curwin, true, false);`
`1564`	`1564`	`advance = false;`
`1565`	`1565`	`}`
`1566`	`1566`
`@@ -1572,7 +1572,7 @@ static void edit_buffers(mparm_T parmp, char_u cwd)`
`1572`	`1572`	`// When w_arg_idx is -1 remove the window (see create_windows()).`
`1573`	`1573`	`if (curwin->w_arg_idx == -1) {`
`1574`	`1574`	`arg_idx++;`
`1575`		`- win_close(curwin, true);`
	`1575`	`+ win_close(curwin, true, false);`
`1576`	`1576`	`advance = false;`
`1577`	`1577`	`continue;`
`1578`	`1578`	`}`
`@@ -1619,7 +1619,7 @@ static void edit_buffers(mparm_T parmp, char_u cwd)`
`1619`	`1619`	`did_emsg = FALSE; // avoid hit-enter prompt`
`1620`	`1620`	`getout(1);`
`1621`	`1621`	`}`
`1622`		`- win_close(curwin, true);`
	`1622`	`+ win_close(curwin, true, false);`
`1623`	`1623`	`advance = false;`
`1624`	`1624`	`}`
`1625`	`1625`	`if (arg_idx == GARGCOUNT - 1) {`
Original file line number	Diff line number	Diff line change
`@@ -2960,7 +2960,7 @@ static int jumpto_tag(const char_u *lbuf_arg, int forceit, int keep_help)`
`2960`	`2960`	`} else {`
`2961`	`2961`	`RedrawingDisabled--;`
`2962`	`2962`	`if (postponed_split) { // close the window`
`2963`		`- win_close(curwin, false);`
	`2963`	`+ win_close(curwin, false, false);`
`2964`	`2964`	`postponed_split = 0;`
`2965`	`2965`	`}`
`2966`	`2966`	`}`