watcher improvements

Author: Damien MEHALA

lua/nvim-tree/explorer/watch.lua

@@ -4,21 +4,19 @@ local Watcher = require("nvim-tree.watcher").Watcher
 
 local M = {}
 
-local IGNORED_PATHS = {
+M.ignore_dirs = {
   -- disable watchers on kernel filesystems
   -- which have a lot of unwanted events
   "/sys",
   "/proc",
   "/dev",
 }
 
-local function is_folder_ignored(path)
-  for _, folder in ipairs(IGNORED_PATHS) do
-    if vim.startswith(path, folder) then
-      return true
-    end
-  end
+function M.ignore_dir(path)
+  table.insert(M.ignore_dirs, path)
+end
 
+local function is_folder_ignored(path)
   for _, ignore_dir in ipairs(M.ignore_dirs) do
     if vim.fn.match(path, ignore_dir) ~= -1 then
       return true
@@ -69,7 +67,7 @@ end
 function M.setup(opts)
   M.enabled = opts.filesystem_watchers.enable
   M.debounce_delay = opts.filesystem_watchers.debounce_delay
-  M.ignore_dirs = opts.filesystem_watchers.ignore_dirs
+  M.ignore_dirs = vim.tbl_extend("force", M.ignore_dirs, opts.filesystem_watchers.ignore_dirs)
   M.uid = 0
 end
 

lua/nvim-tree/git/init.lua

@@ -2,6 +2,7 @@ local log = require "nvim-tree.log"
 local utils = require "nvim-tree.utils"
 local git_utils = require "nvim-tree.git.utils"
 local Runner = require "nvim-tree.git.runner"
+local Watch = require "nvim-tree.explorer.watch"
 local Watcher = require("nvim-tree.watcher").Watcher
 local Iterator = require "nvim-tree.iterators.node-iterator"
 local explorer_node = require "nvim-tree.explorer.node"
@@ -143,12 +144,13 @@ function M.load_project_status(cwd)
     timeout = M.config.git.timeout,
   }
 
-  local git_directory = git_utils.get_git_directory(project_root)
-
   local watcher = nil
+
   if M.config.filesystem_watchers.enable then
     log.line("watcher", "git start")
 
+    local git_directory = git_utils.get_git_directory(project_root)
+
     if git_directory == nil then
       log.line("watcher", "could not found the location of .git folder")
     else
@@ -162,9 +164,10 @@ function M.load_project_status(cwd)
         end)
       end
 
-      -- Add $GIT_DIR to the list of directory to ignore
-      local base_gitdir = utils.path_basename(git_directory)
-      table.insert(M.config.filesystem_watchers.ignore_dirs, base_gitdir)
+      -- Add GIT_DIR to the list of directory to ignore
+      -- local base_gitdir = utils.path_basename(git_directory)
+      -- Watch.ignore_dir(base_gitdir)
+      Watch.ignore_dir(git_directory)
 
       watcher = Watcher:new(git_directory, WATCHED_FILES, callback, {
         project_root = project_root,