perf(#3253): extract au find-file, view

Author: alex-courtis

lua/nvim-tree.lua

@@ -1,6 +1,3 @@
-local api = require("nvim-tree.api")
-local log = require("nvim-tree.log")
-local notify = require("nvim-tree.notify")
 local config = require("nvim-tree.config")
 
 local M = {}
@@ -19,20 +16,11 @@ end
 local function setup_autocommands()
   local augroup_id = vim.api.nvim_create_augroup("NvimTree", { clear = true })
 
-  -- prevent new opened file from opening in the same window as nvim-tree
   vim.api.nvim_create_autocmd("BufWipeout", {
     group = augroup_id,
     pattern = "NvimTree_*",
     callback = function()
-      if not require("nvim-tree.utils").is_nvim_tree_buf(0) then
-        return
-      end
-      local view = require("nvim-tree.view")
-      if config.g.actions.open_file.eject then
-        view._prevent_buffer_override()
-      else
-        view.abandon_current_window()
-      end
+      require("nvim-tree.view").wipeout()
     end,
   })
 
@@ -44,6 +32,7 @@ local function setup_autocommands()
       end)
     })
   end
+
   if config.g.sync_root_with_cwd then
     vim.api.nvim_create_autocmd("DirChanged", {
       group = augroup_id,
@@ -52,17 +41,12 @@ local function setup_autocommands()
       end,
     })
   end
+
   if config.g.update_focused_file.enable then
     vim.api.nvim_create_autocmd("BufEnter", {
       group = augroup_id,
       callback = function(event)
-        local exclude = config.g.update_focused_file.exclude
-        if type(exclude) == "function" and exclude(event) then
-          return
-        end
-        require("nvim-tree.utils").debounce("BufEnter:find_file", config.g.view.debounce_delay, function()
-          require("nvim-tree.actions.tree.find-file").fn()
-        end)
+        require("nvim-tree.actions.tree.find-file").buf_enter(event)
       end,
     })
   end
@@ -97,15 +81,14 @@ local function setup_autocommands()
     vim.api.nvim_create_autocmd("DiagnosticChanged", {
       group = augroup_id,
       callback = function(ev)
-        log.line("diagnostics", "DiagnosticChanged")
         require("nvim-tree.diagnostics").update_lsp(ev)
       end,
     })
+
     vim.api.nvim_create_autocmd("User", {
       group = augroup_id,
       pattern = "CocDiagnosticChange",
       callback = function()
-        log.line("diagnostics", "CocDiagnosticChange")
         require("nvim-tree.diagnostics").update_coc()
       end,
     })
@@ -145,6 +128,7 @@ end
 function M.purge_all_state()
   local view = require("nvim-tree.view")
   local core = require("nvim-tree.core")
+
   view.close_all_tabs()
   view.abandon_all_windows()
   local explorer = core.get_explorer()
@@ -159,8 +143,10 @@ end
 
 ---@param config_user? nvim_tree.config user supplied subset of config
 function M.setup(config_user)
+  local log = require("nvim-tree.log")
+
   if vim.fn.has("nvim-0.9") == 0 then
-    notify.warn("nvim-tree.lua requires Neovim 0.9 or higher")
+    require("nvim-tree.notify").warn("nvim-tree.lua requires Neovim 0.9 or higher")
     return
   end
 
@@ -189,7 +175,7 @@ function M.setup(config_user)
   vim.g.NvimTreeSetup = 1
   vim.api.nvim_exec_autocmds("User", { pattern = "NvimTreeSetup" })
 
-  require("nvim-tree.api.impl").hydrate_post_setup(api)
+  require("nvim-tree.api.impl").hydrate_post_setup(require("nvim-tree.api"))
 end
 
 vim.g.NvimTreeRequired = 1

lua/nvim-tree/actions/tree/find-file.lua

@@ -1,5 +1,6 @@
 local core = require("nvim-tree.core")
 local lib = require("nvim-tree.lib")
+local utils = require("nvim-tree.utils")
 local view = require("nvim-tree.view")
 local config = require("nvim-tree.config")
 local finders_find_file = require("nvim-tree.actions.finders.find-file")
@@ -66,4 +67,15 @@ function M.fn(opts)
   finders_find_file.fn(path)
 end
 
+---@param event vim.api.keyset.create_autocmd.callback_args
+function M.buf_enter(event)
+  local exclude = config.g.update_focused_file.exclude
+  if type(exclude) == "function" and exclude(event) then
+    return
+  end
+  utils.debounce("BufEnter:find_file", config.g.view.debounce_delay, function()
+    M.fn()
+  end)
+end
+
 return M

lua/nvim-tree/diagnostics.lua

@@ -128,6 +128,7 @@ end
 ---On disabling LSP, a reset event will be sent for all buffers.
 ---@param ev table standard event with data.diagnostics populated
 function M.update_lsp(ev)
+  log.line("diagnostics", "DiagnosticChanged")
   if not config.g.diagnostics.enable or not ev or not ev.data or not ev.data.diagnostics then
     return
   end
@@ -174,6 +175,7 @@ end
 ---Fired on CocDiagnosticChanged events:
 ---debounced retrieval, cache update, version increment and draw
 function M.update_coc()
+  log.line("diagnostics", "CocDiagnosticChange")
   if not config.g.diagnostics.enable then
     return
   end

lua/nvim-tree/view.lua

@@ -521,4 +521,17 @@ function M.is_width_determined()
   return type(view_state.Active.width) ~= "function"
 end
 
+---Called on BufWipeout
+---Prevent new opened file from opening in the same window as nvim-tree
+function M.wipeout()
+  if not utils.is_nvim_tree_buf(0) then
+    return
+  end
+  if config.g.actions.open_file.eject then
+    M._prevent_buffer_override()
+  else
+    M.abandon_current_window()
+  end
+end
+
 return M