fix(setup): disable lazyloading autocmd when already setup (#1721)

Author: pynappo

lua/neo-tree.lua

@@ -80,7 +80,7 @@ end
 
 ---Ideally this should only be in plugin/neo-tree.lua but lazy-loading might mean this runs before bufenter
 ---@param path string? The path to check
----@return boolean hijacked Whether the hijack worked
+---@return boolean hijacked Whether we hijacked a buffer
 local function try_netrw_hijack(path)
   if not path or #path == 0 then
     return false

lua/neo-tree/setup/init.lua

@@ -496,6 +496,7 @@ M.merge_config = function(user_config)
   define_events()
 
   -- Prevent accidentally opening another file in the neo-tree window.
+  vim.g.neotree_watching_bufenter = 1
   events.subscribe({
     event = events.VIM_BUFFER_ENTER,
     handler = M.buffer_enter_event,

lua/neo-tree/setup/netrw.lua

@@ -50,11 +50,11 @@ M.hijack = function(path)
   local winid = vim.api.nvim_get_current_win()
   local dir_bufnr = vim.api.nvim_get_current_buf()
 
-  local manager = require("neo-tree.sources.manager")
-  local log = require("neo-tree.log")
   -- Now actually open the tree, with a very quick debounce because this may be
   -- called multiple times in quick succession.
   utils.debounce("hijack_netrw_" .. winid, function()
+    local manager = require("neo-tree.sources.manager")
+    local log = require("neo-tree.log")
     -- We will want to replace the "directory" buffer with either the "alternate"
     -- buffer or a new blank one.
     local replace_with_bufnr = vim.fn.bufnr("#")

plugin/neo-tree.lua

@@ -11,7 +11,7 @@ end, {
 })
 
 ---@param path string? The path to check
----@return boolean hijacked Whether the hijack worked
+---@return boolean hijacked Whether we hijacked a buffer
 local function try_netrw_hijack(path)
   if not path or #path == 0 then
     return false
@@ -35,7 +35,7 @@ local augroup = vim.api.nvim_create_augroup("NeoTree_NetrwDeferred", { clear = t
 vim.api.nvim_create_autocmd("BufEnter", {
   group = augroup,
   callback = function(args)
-    if try_netrw_hijack(args.file) then
+    if vim.g.neotree_watching_bufenter == 1 or try_netrw_hijack(args.file) then
       vim.api.nvim_del_augroup_by_id(augroup)
     end
   end,