remove unloaded_bufnr checks as the view debouncer takes care of it

Author: alex-courtis

lua/nvim-tree.lua

@@ -214,9 +214,7 @@ local function setup_autocommands(opts)
       -- update opened file buffers
       if (filters.config.filter_no_buffer or renderer.config.highlight_opened_files ~= "none") and vim.bo[data.buf].buftype == "" then
         utils.debounce("Buf:filter_buffer", opts.view.debounce_delay, function()
-          buffers.set_unloaded_bufnr(data.buf)
           reloaders.reload_explorer()
-          buffers.reset_unloaded_bufnr()
         end)
       end
     end,

lua/nvim-tree/buffers.lua

@@ -3,9 +3,6 @@ local M = {}
 ---@type table<string, boolean> record of which file is modified
 M._modified = {}
 
----@type number unloaded_bufnr for the duration of BufUnload
-M._unloaded_bufnr = nil
-
 ---refresh M._modified
 function M.reload_modified()
   M._modified = {}
@@ -36,22 +33,11 @@ function M.is_modified(node)
     and (not node.open or M.config.modified.show_on_open_dirs)
 end
 
----A buffer exists for the node's absolute path and it's not in the middle of a BufUnload handler.
+---A buffer exists for the node's absolute path
 ---@param node table
 ---@return boolean
 function M.is_opened(node)
-  return node and vim.fn.bufloaded(node.absolute_path) > 0 and vim.fn.bufnr(node.absolute_path) ~= M._unloaded_bufnr
-end
-
----Set the unloaded bufnr - at the start of the BufUnload handler.
----@param bufnr number
-function M.set_unloaded_bufnr(bufnr)
-  M._unloaded_bufnr = bufnr
-end
-
----Reset the unloaded bufnr - at the end of the BufUnload handler.
-function M.reset_unloaded_bufnr()
-  M._unloaded_bufnr = nil
+  return node and vim.fn.bufloaded(node.absolute_path) > 0
 end
 
 ---@param opts table

lua/nvim-tree/explorer/filters.lua

@@ -47,16 +47,15 @@ end
 ---Check if the given path has no listed buffer
 ---@param path string Absolute path
 ---@param bufinfo table vim.fn.getbufinfo { buflisted = 1 }
----@param unloaded_bufnr number optional bufnr recently unloaded via BufUnload event
 ---@return boolean
-local function buf(path, bufinfo, unloaded_bufnr)
+local function buf(path, bufinfo)
   if not M.config.filter_no_buffer or type(bufinfo) ~= "table" then
     return false
   end
 
   -- filter files with no open buffer and directories containing no open buffers
   for _, b in ipairs(bufinfo) do
-    if b.name == path or b.name:find(path .. "/", 1, true) and b.bufnr ~= unloaded_bufnr then
+    if b.name == path or b.name:find(path .. "/", 1, true) then
       return false
     end
   end
@@ -105,16 +104,13 @@ end
 
 ---Prepare arguments for should_filter. This is done prior to should_filter for efficiency reasons.
 ---@param git_status table|nil optional results of git.load_project_status(...)
----@param unloaded_bufnr number|nil optional bufnr recently unloaded via BufUnload event
 ---@return table
 --- git_status: reference
---- unloaded_bufnr: copy
 --- bufinfo: empty unless no_buffer set: vim.fn.getbufinfo { buflisted = 1 }
 --- bookmarks: absolute paths to boolean
-function M.prepare(git_status, unloaded_bufnr)
+function M.prepare(git_status)
   local status = {
     git_status = git_status or {},
-    unloaded_bufnr = unloaded_bufnr,
     bufinfo = {},
     bookmarks = {},
   }
@@ -140,11 +136,7 @@ function M.should_filter(path, status)
     return false
   end
 
-  return git(path, status.git_status)
-    or buf(path, status.bufinfo, status.unloaded_bufnr)
-    or dotfile(path)
-    or custom(path)
-    or bookmark(path, status.bookmarks)
+  return git(path, status.git_status) or buf(path, status.bufinfo) or dotfile(path) or custom(path) or bookmark(path, status.bookmarks)
 end
 
 function M.setup(opts)

lua/nvim-tree/explorer/reload.lua

@@ -69,8 +69,7 @@ end
 
 ---@param node Node
 ---@param git_status table
----@param unloaded_bufnr number|nil
-function M.reload(node, git_status, unloaded_bufnr)
+function M.reload(node, git_status)
   local cwd = node.link_to or node.absolute_path
   local handle = vim.loop.fs_scandir(cwd)
   if not handle then
@@ -79,7 +78,7 @@ function M.reload(node, git_status, unloaded_bufnr)
 
   local profile = log.profile_start("reload %s", node.absolute_path)
 
-  local filter_status = filters.prepare(git_status, unloaded_bufnr)
+  local filter_status = filters.prepare(git_status)
 
   if node.group_next then
     node.nodes = { node.group_next }