feat(view): filters.no_buffer misses unloaded, handles buffer in/out

Author: alex-courtis

lua/nvim-tree.lua

@@ -11,6 +11,7 @@ local reloaders = require "nvim-tree.actions.reloaders.reloaders"
 local copy_paste = require "nvim-tree.actions.fs.copy-paste"
 local collapse_all = require "nvim-tree.actions.tree-modifiers.collapse-all"
 local git = require "nvim-tree.git"
+local filters = require "nvim-tree.explorer.filters"
 
 local _config = {}
 
@@ -353,6 +354,22 @@ local function setup_autocommands(opts)
     create_nvim_tree_autocmd("BufWritePost", { callback = reloaders.reload_explorer })
   end
 
+  create_nvim_tree_autocmd("BufReadPost", {
+    callback = function()
+      if filters.config.filter_no_buffer then
+        reloaders.reload_explorer()
+      end
+    end,
+  })
+
+  create_nvim_tree_autocmd("BufUnload", {
+    callback = function(data)
+      if filters.config.filter_no_buffer then
+        reloaders.reload_explorer(nil, data.buf)
+      end
+    end,
+  })
+
   if not has_watchers and opts.git.enable then
     create_nvim_tree_autocmd("User", {
       pattern = { "FugitiveChanged", "NeogitStatusRefreshed" },

lua/nvim-tree/actions/finders/search-node.lua

@@ -14,7 +14,7 @@ local function search(search_dir, input_path)
   local function iter(dir)
     local realpath, path, name, stat, handle, _
 
-    local bufinfo = vim.fn.getbufinfo { bufloaded = 1, buflisted = 1 }
+    local bufinfo = vim.fn.getbufinfo { buflisted = 1 }
 
     handle, _ = vim.loop.fs_scandir(dir)
     if not handle then

lua/nvim-tree/actions/reloaders/reloaders.lua

@@ -6,13 +6,13 @@ local core = require "nvim-tree.core"
 
 local M = {}
 
-local function refresh_nodes(node, projects)
+local function refresh_nodes(node, projects, unloaded_bufnr)
   local cwd = node.cwd or node.link_to or node.absolute_path
   local project_root = git.get_project_root(cwd)
-  explorer_module.reload(node, projects[project_root] or {})
+  explorer_module.reload(node, projects[project_root] or {}, unloaded_bufnr)
   for _, _node in ipairs(node.nodes) do
     if _node.nodes and _node.open then
-      refresh_nodes(_node, projects)
+      refresh_nodes(_node, projects, unloaded_bufnr)
     end
   end
 end
@@ -33,14 +33,16 @@ function M.reload_node_status(parent_node, projects)
 end
 
 local event_running = false
-function M.reload_explorer()
+---@param _ table unused node passed by action
+---@param unloaded_bufnr number optional bufnr recently unloaded via BufUnload event
+function M.reload_explorer(_, unloaded_bufnr)
   if event_running or not core.get_explorer() or vim.v.exiting ~= vim.NIL then
     return
   end
   event_running = true
 
   local projects = git.reload()
-  refresh_nodes(core.get_explorer(), projects)
+  refresh_nodes(core.get_explorer(), projects, unloaded_bufnr)
   if view.is_visible() then
     renderer.draw()
   end

lua/nvim-tree/explorer/explore.lua

@@ -15,7 +15,7 @@ end
 local function populate_children(handle, cwd, node, status)
   local node_ignored = node.git_status == "!!"
   local nodes_by_path = utils.bool_record(node.nodes, "absolute_path")
-  local bufinfo = vim.fn.getbufinfo { bufloaded = 1, buflisted = 1 }
+  local bufinfo = vim.fn.getbufinfo { buflisted = 1 }
   while true do
     local name, t = vim.loop.fs_scandir_next(handle)
     if not name then

lua/nvim-tree/explorer/filters.lua

@@ -16,20 +16,23 @@ end
 
 ---Check if the given path should be ignored.
 ---@param path string Absolute path
----@param bufinfo table vim.fn.getbufinfo { bufloaded = 1, buflisted = 1 }
+---@param bufinfo table vim.fn.getbufinfo { buflisted = 1 }
+---@param unloaded_bufnr number optional bufnr recently unloaded via BufUnload event
 ---@return boolean
-function M.should_ignore(path, bufinfo)
+function M.should_ignore(path, bufinfo, unloaded_bufnr)
   local basename = utils.path_basename(path)
 
   -- exclusions override all filters
   if is_excluded(path) then
     return false
   end
 
+  -- TODO exact match for files, ../ for dirs
+
   -- filter files with no open buffer and directories containing no open buffers
   if M.config.filter_no_buffer and type(bufinfo) == "table" then
     for _, buf in ipairs(bufinfo) do
-      if buf.name:find(path, 1, true) then
+      if buf.name:find(path, 1, true) and buf.bufnr ~= unloaded_bufnr then
         return false
       end
     end

lua/nvim-tree/explorer/reload.lua

@@ -34,7 +34,7 @@ local function update_parent_statuses(node, project, root)
   end
 end
 
-function M.reload(node, status)
+function M.reload(node, status, unloaded_bufnr)
   local cwd = node.link_to or node.absolute_path
   local handle = vim.loop.fs_scandir(cwd)
   if type(handle) == "string" then
@@ -44,7 +44,7 @@ function M.reload(node, status)
 
   local ps = log.profile_start("reload %s", node.absolute_path)
 
-  local bufinfo = vim.fn.getbufinfo { bufloaded = 1, buflisted = 1 }
+  local bufinfo = vim.fn.getbufinfo { buflisted = 1 }
 
   if node.group_next then
     node.nodes = { node.group_next }
@@ -73,7 +73,7 @@ function M.reload(node, status)
 
     local abs = utils.path_join { cwd, name }
     t = t or (fs_stat_cached(abs) or {}).type
-    if not filters.should_ignore(abs, bufinfo) and not filters.should_ignore_git(abs, status) then
+    if not filters.should_ignore(abs, bufinfo, unloaded_bufnr) and not filters.should_ignore_git(abs, status) then
       child_names[abs] = true
 
       -- Recreate node if type changes.