Merge branch 'master' into feat-modified-buffers

Author: chomosuke

lua/nvim-tree.lua

@@ -362,16 +362,24 @@ local function setup_autocommands(opts)
   end
 
   create_nvim_tree_autocmd("BufReadPost", {
-    callback = function()
-      if filters.config.filter_no_buffer or renderer.config.highlight_opened_files then
+    callback = function(data)
+      -- update opened file buffers
+      if
+        (filters.config.filter_no_buffer or renderer.config.highlight_opened_files ~= "none")
+        and vim.bo[data.buf].buftype == ""
+      then
         reloaders.reload_explorer()
       end
     end,
   })
 
   create_nvim_tree_autocmd("BufUnload", {
     callback = function(data)
-      if filters.config.filter_no_buffer or renderer.config.highlight_opened_files then
+      -- update opened file buffers
+      if
+        (filters.config.filter_no_buffer or renderer.config.highlight_opened_files ~= "none")
+        and vim.bo[data.buf].buftype == ""
+      then
         reloaders.reload_explorer(nil, data.buf)
       end
     end,

lua/nvim-tree/actions/fs/copy-paste.lua

@@ -132,7 +132,7 @@ end
 function M.clear_clipboard()
   clipboard.move = {}
   clipboard.copy = {}
-  utils.notify.info "Clipboard has been emptied."
+  notify.info "Clipboard has been emptied."
 end
 
 function M.copy(node)

lua/nvim-tree/explorer/explore.lua

@@ -4,7 +4,6 @@ local explorer_node = require "nvim-tree.explorer.node"
 local sorters = require "nvim-tree.explorer.sorters"
 local filters = require "nvim-tree.explorer.filters"
 local live_filter = require "nvim-tree.live-filter"
-local notify = require "nvim-tree.notify"
 local log = require "nvim-tree.log"
 
 local M = {}
@@ -46,18 +45,9 @@ local function populate_children(handle, cwd, node, git_status)
   end
 end
 
-local function get_dir_handle(cwd)
-  local handle, err = utils.fs_scandir_profiled(cwd)
-  if err then
-    notify.error(string.format("Failed exploring %s: %s", cwd, vim.inspect(err)))
-    return
-  end
-  return handle
-end
-
 function M.explore(node, status)
   local cwd = node.link_to or node.absolute_path
-  local handle = get_dir_handle(cwd)
+  local handle = utils.fs_scandir_profiled(cwd)
   if not handle then
     return
   end

lua/nvim-tree/explorer/node.lua

@@ -121,6 +121,7 @@ function M.node_destroy(node)
 
   if node.watcher then
     node.watcher:destroy()
+    node.watcher = nil
   end
 end
 

lua/nvim-tree/explorer/reload.lua

@@ -4,7 +4,6 @@ local explorer_node = require "nvim-tree.explorer.node"
 local filters = require "nvim-tree.explorer.filters"
 local sorters = require "nvim-tree.explorer.sorters"
 local live_filter = require "nvim-tree.live-filter"
-local notify = require "nvim-tree.notify"
 local git = require "nvim-tree.git"
 local log = require "nvim-tree.log"
 
@@ -36,9 +35,8 @@ end
 
 function M.reload(node, git_status, unloaded_bufnr)
   local cwd = node.link_to or node.absolute_path
-  local handle, err = utils.fs_scandir_profiled(cwd)
-  if err then
-    notify.error(string.format("Failed reloading %s: %s", cwd, vim.inspect(err)))
+  local handle = utils.fs_scandir_profiled(cwd)
+  if not handle then
     return
   end
 

lua/nvim-tree/explorer/watch.lua

@@ -51,6 +51,9 @@ function M.create_watcher(node)
   local function callback(watcher)
     log.line("watcher", "node event scheduled refresh %s", watcher.context)
     utils.debounce(watcher.context, M.debounce_delay, function()
+      if watcher.destroyed then
+        return
+      end
       if node.link_to then
         log.line("watcher", "node event executing refresh '%s' -> '%s'", node.link_to, node.absolute_path)
       else

lua/nvim-tree/git/init.lua

@@ -150,6 +150,9 @@ function M.load_project_status(cwd)
     local callback = function(w)
       log.line("watcher", "git event scheduled '%s'", w.project_root)
       utils.debounce("git:watcher:" .. w.project_root, M.config.filesystem_watchers.debounce_delay, function()
+        if w.destroyed then
+          return
+        end
         reload_tree_at(w.project_root)
       end)
     end

lua/nvim-tree/watcher.lua

@@ -99,6 +99,8 @@ function Event:destroy(message)
   end
 
   Event._events[self._path] = nil
+
+  self.destroyed = true
 end
 
 function Watcher:new(path, files, callback, data)
@@ -139,6 +141,8 @@ function Watcher:destroy()
   self._event:remove(self._listener)
 
   utils.array_remove(Watcher._watchers, self)
+
+  self.destroyed = true
 end
 
 M.Watcher = Watcher