fix(#1731): find-file locks/profiles on real path, reloads when watchers disabled

Author: alex-courtis

lua/nvim-tree/actions/finders/find-file.lua

@@ -3,6 +3,7 @@ local view = require "nvim-tree.view"
 local utils = require "nvim-tree.utils"
 local renderer = require "nvim-tree.renderer"
 local core = require "nvim-tree.core"
+local reloaders = require "nvim-tree.actions.reloaders.reloaders"
 local Iterator = require "nvim-tree.iterators.node-iterator"
 
 local M = {}
@@ -12,18 +13,27 @@ local running = {}
 ---Find a path in the tree, expand it and focus it
 ---@param fname string full path
 function M.fn(fname)
-  if running[fname] or not core.get_explorer() then
+  if not core.get_explorer() then
     return
   end
-  running[fname] = true
 
-  local ps = log.profile_start("find file %s", fname)
   -- always match against the real path
   local fname_real = vim.loop.fs_realpath(fname)
   if not fname_real then
     return
   end
 
+  if running[fname_real] then
+    return
+  end
+  running[fname_real] = true
+
+  local ps = log.profile_start("find file %s", fname_real)
+
+  if not M.filesystem_watchers_enabled then
+    reloaders.reload_explorer()
+  end
+
   local line = core.get_nodes_starting_line()
 
   local absolute_paths_searched = {}
@@ -60,9 +70,13 @@ function M.fn(fname)
     view.set_cursor { line, 0 }
   end
 
-  running[fname] = false
+  running[fname_real] = false
+
+  log.profile_end(ps, "find file %s", fname_real)
+end
 
-  log.profile_end(ps, "find file %s", fname)
+function M.setup(opts)
+  M.filesystem_watchers_enabled = opts.filesystem_watchers.enabled
 end
 
 return M

lua/nvim-tree/actions/init.lua

@@ -385,6 +385,7 @@ local DEFAULT_MAPPING_CONFIG = {
 }
 
 function M.setup(opts)
+  require("nvim-tree.actions.finders.find-file").setup(opts)
   require("nvim-tree.actions.fs.trash").setup(opts)
   require("nvim-tree.actions.node.system-open").setup(opts)
   require("nvim-tree.actions.node.file-popup").setup(opts)