fix(files): replace buffer before wiping when deleted, fixes #65

Author: cseickel

lua/neo-tree.lua

@@ -409,9 +409,13 @@ M.win_enter_event = function()
     log.trace("prior window is ", prior_exists)
     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.cmd("q!")
-      return
+      local position = vim.api.nvim_buf_get_var(0, "neo_tree_position")
+      if position ~= "split" then
+        -- close_if_last_window just doesn't make sense for a split style
+        log.trace("last window, closing")
+        vim.cmd("q!")
+        return
+      end
     end
   end
 

lua/neo-tree/sources/common/commands.lua

@@ -158,7 +158,7 @@ local open_with_cmd = function(state, open_cmd, toggle_directory)
   local tree = state.tree
   local success, node = pcall(tree.get_node, tree)
   if not success and node then
-    log.error("Could not get node.")
+    log.debug("Could not get node.")
     return
   end
   if node.type == "directory" then

lua/neo-tree/sources/filesystem/lib/fs_actions.lua

@@ -16,11 +16,23 @@ local log = require("neo-tree.log")
 local M = {}
 
 local function clear_buffer(path)
-  for _, buf in pairs(api.nvim_list_bufs()) do
-    if api.nvim_buf_get_name(buf) == path then
-      pcall(vim.api.nvim_buf_delete, buf, { force = true })
+  local buf = utils.find_buffer_by_name(path)
+  local alt = vim.fn.bufnr("#")
+  -- Check all windows to see if they are using the buffer
+  for _, win in ipairs(vim.api.nvim_list_wins()) do
+    if vim.api.nvim_win_get_buf(win) == buf then
+      -- if there is no alternate buffer yet, create a blank one now
+      if alt < 1 or alt == buf then
+        alt = vim.api.nvim_create_buf(true, false)
+      end
+      -- replace the buffer displayed in this window with the alternate buffer
+      vim.api.nvim_win_set_buf(win, alt)
     end
   end
+  local success, msg = pcall(vim.api.nvim_buf_delete, buf, { force = true })
+  if not success then
+    log.error("Could not clear buffer: ", msg)
+  end
 end
 
 local function create_all_parents(path)
@@ -184,11 +196,11 @@ M.delete_node = function(path, callback)
             return false
           end
         else
-          clear_buffer(child_path)
           local success = loop.fs_unlink(child_path)
           if not success then
             return false
           end
+          clear_buffer(child_path)
         end
       end
       return loop.fs_rmdir(dir_path)