fix: close last window with q!, fixes #137; also refactor close_all_floats

Author: cseickel

lua/neo-tree.lua

@@ -397,6 +397,9 @@ M.win_enter_event = function()
     return
   end
 
+  -- if the new win is not a floating window, make sure all neo-tree floats are closed
+  require("neo-tree").close_all("float")
+
   if M.config.close_if_last_window then
     local tabnr = vim.api.nvim_get_current_tabpage()
     local wins = utils.get_value(M, "config.prior_windows", {})[tabnr]
@@ -407,7 +410,7 @@ M.win_enter_event = function()
     log.trace("win_count: ", win_count)
     if prior_exists and win_count == 1 and vim.o.filetype == "neo-tree" then
       log.trace("last window, closing")
-      vim.api.nvim_win_close(0, true)
+      vim.cmd("q!")
       return
     end
   end
@@ -582,17 +585,11 @@ M.setup = function(config, is_auto_config)
     manager.redraw(source_name)
   end
 
-  local event_handler = {
+  events.subscribe({
     event = events.VIM_WIN_ENTER,
     handler = M.win_enter_event,
     id = "neo-tree-win-enter",
-  }
-  if config.open_files_in_last_window or config.close_if_last_window then
-    events.subscribe(event_handler)
-  else
-    events.unsubscribe(event_handler)
-    config.prior_windows = nil
-  end
+  })
 
   if not is_auto_config and get_hijack_netrw_behavior() ~= "disabled" then
     vim.cmd("silent! autocmd! FileExplorer *")

lua/neo-tree/ui/renderer.lua

@@ -363,33 +363,6 @@ create_tree = function(state)
   })
 end
 
-local auto_close_floats_is_set = false
-
-local enable_auto_close_floats = function()
-  if auto_close_floats_is_set then
-    log.trace("Auto close floats is already set.")
-    return
-  end
-  local event_handler = {
-    event = events.VIM_WIN_ENTER,
-    handler = function()
-      local win_id = vim.api.nvim_get_current_win()
-      local cfg = vim.api.nvim_win_get_config(win_id)
-      if cfg.relative > "" or cfg.external then
-        -- floating window, ignore
-        log.trace("Ignoring floating window", cfg)
-        return
-      end
-      log.trace("Closing all floating windows")
-      require("neo-tree").close_all("float")
-    end,
-    id = "neo-tree-auto-close-floats",
-  }
-  log.trace("Enabling auto close floats")
-  events.subscribe(event_handler)
-  auto_close_floats_is_set = true
-end
-
 create_window = function(state)
   local default_position = utils.resolve_config_option(state, "window.position", "left")
   state.current_position = state.current_position or default_position
@@ -445,7 +418,6 @@ create_window = function(state)
 
     -- why is this necessary?
     vim.api.nvim_set_current_win(win.winid)
-    enable_auto_close_floats()
   elseif state.current_position == "split" then
     local winid = vim.api.nvim_get_current_win()
     local bufnr = vim.fn.bufnr(bufname)