feat(files): cleanup netrw hijack to work with [v]split ., fixes #121

Author: cseickel

lua/neo-tree.lua

@@ -81,6 +81,22 @@ local check_source = function(source_name)
   return source_name
 end
 
+local hijack_netrw = function()
+  local bufname = vim.api.nvim_buf_get_name(0)
+  local stats = vim.loop.fs_stat(bufname)
+  local is_dir = stats and stats.type == "directory"
+  if is_dir then
+    local bufnr = vim.api.nvim_get_current_buf()
+    vim.cmd("silent! b#") -- to make the alternate buffer correct after wiping the directory buffer
+    manager.navigate("filesystem", bufname, nil, function()
+      vim.cmd("bwipeout! " .. bufnr)
+    end)
+    return true
+  else
+    return false
+  end
+end
+
 local get_position = function(source_name)
   local pos = utils.get_value(M, "config." .. source_name .. ".window.position", "left")
   return pos
@@ -154,19 +170,6 @@ M.focus = function(source_name, close_others, toggle_if_open)
   manager.focus(source_name)
 end
 
-M.hijack_netrw = function()
-  local bufname = vim.api.nvim_buf_get_name(0)
-  local stats = vim.loop.fs_stat(bufname)
-  local is_dir = stats and stats.type == "directory"
-  if is_dir then
-    vim.cmd("bwipeout!")
-    manager.navigate("filesystem", bufname)
-    return true
-  else
-    return false
-  end
-end
-
 M.reveal_current_file = function(source_name, toggle_if_open)
   source_name = check_source(source_name)
   if get_position(source_name) == "split" then
@@ -280,7 +283,7 @@ M.buffer_enter_event = function(args)
   end
 
   -- if vim is trying to open a dir, then we hijack it
-  if M.hijack_netrw() then
+  if hijack_netrw() then
     return
   end
 

lua/neo-tree/sources/manager.lua

@@ -317,6 +317,7 @@ M.focus = function(source_name, path_to_reveal, callback)
 end
 
 ---Navigate to the given path.
+---@param state_or_source_name string|table The state or source name to navigate.
 ---@param path string Path to navigate to. If empty, will navigate to the cwd.
 ---@param path_to_reveal string Node to focus after the items are loaded.
 ---@param callback function Callback to call after the items are loaded.