chore: add more optimizations to git

do not redraw when applying updates on git, only redraw when a new
project is indexed.

Author: kyazdani42

lua/nvim-tree.lua

@@ -381,7 +381,7 @@ local function setup_autocommands(opts)
     au ColorScheme * lua require'nvim-tree'.reset_highlight()
 
     au BufWritePost * lua require'nvim-tree.lib'.refresh_tree(true)
-    au User FugitiveChanged,NeogitStatusRefreshed lua require'nvim-tree'.refresh()
+    au User FugitiveChanged,NeogitStatusRefreshed lua require'nvim-tree.git'.full_reload()
   ]]
 
   if opts.auto_close then

lua/nvim-tree/git/init.lua

@@ -8,6 +8,11 @@ local M = {
   toplevels = {},
 }
 
+function M.has_git_plugin()
+  local has_neogit = pcall(require, 'neogit')
+  return vim.fn.exists('g:loaded_fugitive') == 1 or has_neogit
+end
+
 function M.apply_updates(node)
   local filter_ignored = M.config.ignore and not require'nvim-tree.populate'.show_ignored
   updater.update(M.db, node, filter_ignored)
@@ -50,23 +55,23 @@ end
 
 function M.run_git_status(toplevel, node)
   local show_untracked = M.toplevels[toplevel]
-  local runner = Runner.new {
+  Runner.new {
     db = M.db,
     toplevel = toplevel,
     show_untracked = show_untracked,
     with_ignored = M.config.ignore,
-    timeout = M.config.timeout
-  }
-
-  runner:run(M.handle_update(node), clear)
+    timeout = M.config.timeout,
+    on_end = M.handle_update(node),
+    after_clear = clear,
+  }:run()
 end
 
-function M.run(node, toplevel)
+function M.run(node)
   if not M.config.enable then
     return
   end
 
-  toplevel = toplevel or git_utils.get_toplevel(node.absolute_path)
+  local toplevel = git_utils.get_toplevel(node.absolute_path)
   if not toplevel then
     return
   end
@@ -75,7 +80,7 @@ function M.run(node, toplevel)
     M.set_toplevel(nil, toplevel)
     M.run_git_status(toplevel, node)
   else
-    M.handle_update(node)()
+    M.apply_updates(node)
   end
 end
 
@@ -88,30 +93,31 @@ local function check_sqlite()
   end
 end
 
-function M.reload()
+function M.full_reload()
   if not M.config.enable then
     return
   end
 
+  local tree = require'nvim-tree.lib'.Tree
   for toplevel, show_untracked in pairs(M.toplevels) do
-    local runner = Runner.new {
-      db = M.db,
-      toplevel = toplevel,
-      show_untracked = show_untracked,
-      with_ignored = M.config.ignore,
-      timeout = M.config.timeout
-    }
-    local tree = require'nvim-tree.lib'.Tree
     local node
     if utils.str_find(tree.cwd, toplevel) then
       node = { entries = tree.entries, absolute_path = tree.cwd }
     else
       node = utils.find_node(tree.entries, function(n)
-        return toplevel == n.absolute_path or vim.startswith(n.absolute_path, toplevel)
+        return utils.str_find(n.absolute_path, toplevel)
       end)
     end
     if node then
-      runner:run(M.handle_update(node), clear)
+      Runner.new {
+        db = M.db,
+        toplevel = toplevel,
+        show_untracked = show_untracked,
+        with_ignored = M.config.ignore,
+        timeout = M.config.timeout,
+        on_end = M.handle_update(node),
+        after_clear = clear,
+      }:run()
     end
   end
 end

lua/nvim-tree/git/runner.lua

@@ -64,7 +64,7 @@ function Runner:_populate_db()
   handle = uv.spawn("git", self:_getopts(stdout), vim.schedule_wrap(function()
     if not has_timedout then
       self.db:insert_cache()
-      self.and_then()
+      self.on_end()
     else
       self.db:clear()
     end
@@ -87,9 +87,7 @@ function Runner:_populate_db()
   end))
 end
 
-function Runner:run(and_then, after_clear)
-  self.and_then = and_then
-  self.after_clear = after_clear
+function Runner:run()
   self:_populate_db()
 end
 
@@ -101,6 +99,8 @@ function Runner.new(opts)
     show_untracked = opts.show_untracked,
     with_ignored = opts.with_ignored,
     timeout = opts.timeout,
+    on_end = opts.on_end,
+    after_clear = opts.after_clear,
   }, Runner)
 end
 

lua/nvim-tree/lib.lua

@@ -28,18 +28,16 @@ function M.init(with_open)
     M.Tree.cwd = luv.cwd()
   end
   populate(M.Tree.entries, M.Tree.cwd)
+  git.run({ absolute_path = M.Tree.cwd, entries = M.Tree.entries })
 
   local stat = luv.fs_stat(M.Tree.cwd)
   M.Tree.last_modified = stat.mtime.sec
 
   if with_open then
     M.open()
-  elseif view.win_open() then
-    M.refresh_tree()
   end
 
   M.redraw()
-  git.run({ absolute_path = M.Tree.cwd, entries = M.Tree.entries })
 
   if not first_init_done then
     events._dispatch_ready()
@@ -130,16 +128,10 @@ function M.unroll_dir(node)
   if node.has_children then node.has_children = false end
   if #node.entries == 0 then
     populate(node.entries, node.link_to or node.absolute_path, node)
-  end
-
-  local toplevel = git.get_loaded_toplevel(node.absolute_path)
-  if toplevel then
-    git.run(node, toplevel)
-  else
-    M.redraw()
     git.run(node)
   end
 
+  M.redraw()
   diagnostics.update()
 end
 
@@ -169,7 +161,10 @@ function M.refresh_tree(disable_clock)
     M.redraw()
   end
 
-  git.reload()
+  -- do not refresh git if neogit or fugitive are loaded and root dir is a project
+  if not git.toplevels[M.Tree.cwd] or not git.has_git_plugin() then
+    git.full_reload()
+  end
   diagnostics.update()
   if not disable_clock then
     vim.defer_fn(function() refreshing = false end, vim.g.nvim_tree_refresh_wait or 1000)
@@ -188,26 +183,18 @@ function M.set_index_and_redraw(fname)
 
   local should_redraw = false
 
-  local new_git_toplevels = {}
-
   local function iterate_nodes(nodes)
     for _, node in ipairs(nodes) do
       i = i + 1
       if node.absolute_path == fname then
         return i
       end
 
-      local path_matches = utils.str_find(fname, node.absolute_path)
+      local path_matches = utils.str_find(fname, node.absolute_path..utils.path_separator)
       if path_matches then
         if #node.entries == 0 then
           populate(node.entries, node.absolute_path, node)
-          local toplevel = require'nvim-tree.git.utils'.get_toplevel(node.absolute_path)
-          if git.toplevels[toplevel] then
-            git.apply_updates(node)
-          elseif toplevel and not vim.tbl_contains(new_git_toplevels, toplevel) then
-            table.insert(new_git_toplevels, toplevel)
-            git.run(node, toplevel)
-          end
+          git.run(node)
           should_redraw = true
         end
         if node.open == false then