feat(files): hijack netrw working, partial work on #23

Author: cseickel

lua/neo-tree.lua

@@ -143,6 +143,19 @@ 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 toggle_if_open then
@@ -201,6 +214,72 @@ M.paste_default_config = function()
   end)
 end
 
+M.buffer_enter_event = function(args)
+  if utils.is_floating() then
+    return
+  end
+  -- if vim is trying to open a dir, then we hijack it
+  if M.hijack_netrw() then
+    return
+  end
+  -- if it is a neo-tree window, just set local options
+  if vim.bo.filetype == "neo-tree" then
+    vim.cmd([[
+    setlocal cursorline
+    setlocal nowrap
+    setlocal winhighlight=Normal:NeoTreeNormal,NormalNC:NeoTreeNormalNC,CursorLine:NeoTreeCursorLine,FloatBorder:NeoTreeFloatBorder
+    setlocal nolist nospell nonumber norelativenumber
+    ]])
+    return
+  end
+  if vim.bo.filetype == "neo-tree-popup" then
+    vim.cmd([[
+    setlocal winhighlight=Normal:NeoTreeNormal,FloatBorder:NeoTreeFloatBorder
+    setlocal nolist nospell nonumber norelativenumber
+    ]])
+    return
+  end
+
+  -- For all others, make sure another buffer is not hijacking our window
+  local prior_buf = vim.fn.bufnr("#")
+  if prior_buf < 1 then
+    return
+  end
+  local prior_type = vim.api.nvim_buf_get_option(prior_buf, "filetype")
+  if prior_type == "neo-tree" then
+    local current_tabnr = vim.api.nvim_get_current_tabpage()
+    local neo_tree_tabnr = vim.api.nvim_buf_get_var(prior_buf, "neo_tree_tabnr")
+    if neo_tree_tabnr ~= current_tabnr then
+      -- This a new tab, so the alternate being neo-tree doesn't matter.
+      return
+    end
+    local neo_tree_winid = vim.api.nvim_buf_get_var(prior_buf, "neo_tree_winid")
+    local current_winid = vim.api.nvim_get_current_win()
+    if neo_tree_winid ~= current_winid then
+      -- This is not the neo-tree window, so the alternate being neo-tree doesn't matter.
+      return
+    end
+
+    local bufname = vim.api.nvim_buf_get_name(0)
+    log.debug("redirecting buffer " .. bufname .. " to new split")
+    vim.cmd("b#")
+    -- Using schedule at this point  fixes problem with syntax
+    -- highlighting in the buffer. I also prevents errors with diagnostics
+    -- trying to work with gthe buffer as it's being closed.
+    vim.schedule(function()
+      -- try to delete the buffer, only because if it was new it would take
+      -- on options from the neo-tree window that are undesirable.
+      pcall(vim.cmd, "bdelete " .. bufname)
+      local fake_state = {
+        window = {
+          position = "left",
+        },
+      }
+      utils.open_file(fake_state, bufname)
+    end)
+  end
+end
+
 M.win_enter_event = function()
   local win_id = vim.api.nvim_get_current_win()
   if utils.is_floating(win_id) then
@@ -272,48 +351,7 @@ M.setup = function(config)
   -- Prevent accidentally opening another file in the neo-tree window.
   events.subscribe({
     event = events.VIM_BUFFER_ENTER,
-    handler = function(args)
-      if utils.is_floating() then
-        return
-      end
-      local prior_buf = vim.fn.bufnr("#")
-      if prior_buf < 1 then
-        return
-      end
-      local prior_type = vim.api.nvim_buf_get_option(prior_buf, "filetype")
-      if prior_type == "neo-tree" and vim.bo.filetype ~= "neo-tree" then
-        local current_tabnr = vim.api.nvim_get_current_tabpage()
-        local neo_tree_tabnr = vim.api.nvim_buf_get_var(prior_buf, "neo_tree_tabnr")
-        if neo_tree_tabnr ~= current_tabnr then
-          -- This a new tab, so the alternate being neo-tree doesn't matter.
-          return
-        end
-        local neo_tree_winid = vim.api.nvim_buf_get_var(prior_buf, "neo_tree_winid")
-        local current_winid = vim.api.nvim_get_current_win()
-        if neo_tree_winid ~= current_winid then
-          -- This is not the neo-tree window, so the alternate being neo-tree doesn't matter.
-          return
-        end
-
-        local bufname = vim.api.nvim_buf_get_name(0)
-        log.debug("redirecting buffer " .. bufname .. " to new split")
-        vim.cmd("b#")
-        -- Using schedule at this point  fixes problem with syntax
-        -- highlighting in the buffer. I also prevents errors with diagnostics
-        -- trying to work with gthe buffer as it's being closed.
-        vim.schedule(function()
-          -- try to delete the buffer, only because if it was new it would take
-          -- on options from the neo-tree window that are undesirable.
-          pcall(vim.cmd, "bdelete " .. bufname)
-          local fake_state = {
-            window = {
-              position = "left",
-            },
-          }
-          utils.open_file(fake_state, bufname)
-        end)
-      end
-    end,
+    handler = M.buffer_enter_event,
   })
 
   if config.event_handlers ~= nil then

lua/neo-tree/ui/renderer.lua

@@ -357,26 +357,10 @@ local enable_auto_close_floats = function()
 end
 
 create_window = function(state)
-  local winhl = string.format(
-    "Normal:%s,NormalNC:%s,CursorLine:%s",
-    highlights.NORMAL,
-    highlights.NORMALNC,
-    highlights.CURSOR_LINE
-  )
-
   local win_options = {
     size = utils.resolve_config_option(state, "window.width", "40"),
     position = utils.resolve_config_option(state, "window.position", "left"),
     relative = "editor",
-    win_options = {
-      cursorline = true,
-      number = false,
-      relativenumber = false,
-      wrap = false,
-      winhighlight = winhl,
-      list = false,
-      spell = false,
-    },
     buf_options = {
       buftype = "nowrite",
       modifiable = false,
@@ -391,6 +375,8 @@ create_window = function(state)
     -- First get the default options for floating windows.
     local sourceTitle = state.name:gsub("^%l", string.upper)
     win_options = popups.popup_options("Neo-tree " .. sourceTitle, 40, win_options)
+    win_options.win_options = nil
+    print(vim.inspect(win_options))
     win_options.zindex = 40
     local size = { width = 60, height = "80%" }
 

plugin/neo-tree.vim

@@ -17,3 +17,13 @@ command! NeoTreeRevealToggle lua require("neo-tree").reveal_current_file("filesy
 command! NeoTreePasteConfig lua require("neo-tree").paste_default_config()
 command! -nargs=? NeoTreeSetLogLevel   lua require("neo-tree").set_log_level("<args>")
 command! NeoTreeLogs lua require("neo-tree").show_logs()
+
+augroup NeoTreePluginLoad
+  autocmd!
+  silent! autocmd! FileExplorer *
+augroup END
+
+let g:loaded_netrw = 1
+let g:loaded_netrwPlugin = 1
+let g:loaded_netrwSettings = 1
+let g:loaded_netrwFileHandlers = 1