perf(#3257): remove watch setup

Author: alex-courtis

lua/nvim-tree.lua

@@ -286,7 +286,6 @@ function M.setup(config_user)
   end
 
   require("nvim-tree.appearance").setup()
-  require("nvim-tree.explorer.watch").setup(config.g)
   require("nvim-tree.view").setup(config.g)
   require("nvim-tree.renderer.components").setup(config.g)
 

lua/nvim-tree/explorer/watch.lua

@@ -5,10 +5,10 @@ local notify = require("nvim-tree.notify")
 local config = require("nvim-tree.config")
 local Watcher = require("nvim-tree.watcher").Watcher
 
-local M = {
-  config = {},
-  uid = 0,
-}
+local M = {}
+
+-- monotonically increasing, unique
+local uid = 0
 
 ---@param path string
 ---@return boolean
@@ -48,7 +48,7 @@ local function is_folder_ignored(path)
 
   ---Return true when p matches an entry in dirs, escaping for windows
   ---@param p string absolute path
-  ---@param dirs string[] absolute or relative
+  ---@param dirs string[] regexes
   ---@return boolean
   local function matches_dirs(p, dirs)
     for _, dir in ipairs(dirs) do
@@ -63,22 +63,22 @@ local function is_folder_ignored(path)
     return false
   end
 
-  if type(M.config.filesystem_watchers.ignore_dirs) == "table" then
-    if matches_dirs(path, M.config.filesystem_watchers.ignore_dirs) then
+  if type(config.g.filesystem_watchers.ignore_dirs) == "table" then
+    if matches_dirs(path, config.g.filesystem_watchers.ignore_dirs --[[@as string[] ]]) then
       return true
     end
-  elseif type(M.config.filesystem_watchers.ignore_dirs) == "function" then
-    if M.config.filesystem_watchers.ignore_dirs(path) then
+  elseif type(config.g.filesystem_watchers.ignore_dirs) == "function" then
+    if config.g.filesystem_watchers.ignore_dirs(path) then
       return true
     end
   end
 
-  if type(M.config.filesystem_watchers.whitelist_dirs) == "table" and #M.config.filesystem_watchers.whitelist_dirs > 0 then
-    if not matches_dirs(path, M.config.filesystem_watchers.whitelist_dirs) then
+  if type(config.g.filesystem_watchers.whitelist_dirs) == "table" and #config.g.filesystem_watchers.whitelist_dirs > 0 then
+    if not matches_dirs(path, config.g.filesystem_watchers.whitelist_dirs --[[@as string[] ]]) then
       return true
     end
-  elseif type(M.config.filesystem_watchers.whitelist_dirs) == "function" then
-    if not M.config.filesystem_watchers.whitelist_dirs(path) then
+  elseif type(config.g.filesystem_watchers.whitelist_dirs) == "function" then
+    if not config.g.filesystem_watchers.whitelist_dirs(path) then
       return true
     end
   end
@@ -89,7 +89,7 @@ end
 ---@param node DirectoryNode
 ---@return Watcher|nil
 function M.create_watcher(node)
-  if not M.config.filesystem_watchers.enable or type(node) ~= "table" then
+  if not config.g.filesystem_watchers.enable or type(node) ~= "table" then
     return nil
   end
 
@@ -106,18 +106,18 @@ function M.create_watcher(node)
     watcher.data.outstanding_events = watcher.data.outstanding_events + 1
 
     -- disable watcher when outstanding exceeds max
-    if M.config.filesystem_watchers.max_events > 0 and watcher.data.outstanding_events > M.config.filesystem_watchers.max_events then
+    if config.g.filesystem_watchers.max_events > 0 and watcher.data.outstanding_events > config.g.filesystem_watchers.max_events then
       notify.error(string.format(
         "Observed %d consecutive file system events with interval < %dms, exceeding filesystem_watchers.max_events=%s. Disabling watcher for directory '%s'. Consider adding this directory to filesystem_watchers.ignore_dirs",
         watcher.data.outstanding_events,
-        M.config.filesystem_watchers.debounce_delay,
-        M.config.filesystem_watchers.max_events,
+        config.g.filesystem_watchers.debounce_delay,
+        config.g.filesystem_watchers.max_events,
         node.absolute_path
       ))
       node:destroy_watcher()
     end
 
-    utils.debounce(watcher.data.context, M.config.filesystem_watchers.debounce_delay, function()
+    utils.debounce(watcher.data.context, config.g.filesystem_watchers.debounce_delay, function()
       if watcher.destroyed then
         return
       end
@@ -134,20 +134,15 @@ function M.create_watcher(node)
     end)
   end
 
-  M.uid = M.uid + 1
+  uid = uid + 1
   return Watcher:create({
     path = path,
     callback = callback,
     data = {
-      context = "explorer:watch:" .. path .. ":" .. M.uid,
+      context = "explorer:watch:" .. path .. ":" .. uid,
       outstanding_events = 0, -- unprocessed events that have not been debounced
     }
   })
 end
 
-function M.setup(opts)
-  M.config.filesystem_watchers = opts.filesystem_watchers
-  M.uid = 0
-end
-
 return M