chore: better git implementation on set_index_and_redraw

also refactor some code, remove match_name match_path properties from
nodes because they are basically useless, better to use `vim.fn.stridx`

Author: kyazdani42

lua/nvim-tree.lua

@@ -242,7 +242,7 @@ local function update_base_dir_with_filepath(filepath, bufnr)
 
   local ft = api.nvim_buf_get_option(bufnr, 'filetype') or ""
   for _, value in pairs(_config.update_focused_file.ignore_list) do
-    if vim.fn.stridx(filepath, value) ~= -1 or vim.fn.stridx(ft, value) ~= -1 then
+    if utils.str_find(filepath, value) or utils.str_find(ft, value) then
       return
     end
   end

lua/nvim-tree/git/init.lua

@@ -1,16 +1,21 @@
-local utils = require'nvim-tree.git.utils'
+local git_utils = require'nvim-tree.git.utils'
 local updater = require'nvim-tree.git.tree-update'
 local Runner = require'nvim-tree.git.runner'
+local utils = require'nvim-tree.utils'
 
 local M = {
   db = nil,
   toplevels = {},
 }
 
+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)
+end
+
 function M.handle_update(node)
   return function()
-    local filter_ignored = M.config.ignore and not require'nvim-tree.populate'.show_ignored
-    updater.update(M.db, node, filter_ignored)
+    M.apply_updates(node)
     require'nvim-tree.lib'.redraw()
   end
 end
@@ -19,7 +24,7 @@ function M.get_loaded_toplevel(path)
   if not M.config.enable then
     return
   end
-  local toplevel = utils.get_toplevel(path)
+  local toplevel = git_utils.get_toplevel(path)
   if not toplevel or not M.toplevels[toplevel] then
     return
   end
@@ -30,17 +35,17 @@ function M.set_toplevel(path, toplevel)
   if not M.config.enable then
     return
   end
-  toplevel = toplevel or utils.get_toplevel(path)
+  toplevel = toplevel or git_utils.get_toplevel(path)
   if not toplevel or M.toplevels[toplevel] ~= nil then
     return
   end
 
-  M.toplevels[toplevel] = utils.show_untracked(toplevel)
+  M.toplevels[toplevel] = git_utils.show_untracked(toplevel)
 end
 
 local function clear()
   M.config.enable = false
-  require'nvim-tree.utils'.echo_warning("git integration has been disabled, timeout was exceeded")
+  utils.echo_warning("git integration has been disabled, timeout was exceeded")
 end
 
 function M.run_git_status(toplevel, node)
@@ -61,7 +66,7 @@ function M.run(node, toplevel)
     return
   end
 
-  toplevel = toplevel or utils.get_toplevel(node.absolute_path)
+  toplevel = toplevel or git_utils.get_toplevel(node.absolute_path)
   if not toplevel then
     return
   end
@@ -78,7 +83,7 @@ local function check_sqlite()
   local has_sqlite = pcall(require, 'sqlite')
   if M.config.enable and not has_sqlite then
     local info = "Git integration requires `tami5/sqlite.lua` to be installed (see :help nvim-tree.git)"
-    require'nvim-tree.utils'.echo_warning(info)
+    utils.echo_warning(info)
     M.config.enable = false
   end
 end
@@ -98,10 +103,10 @@ function M.reload()
     }
     local tree = require'nvim-tree.lib'.Tree
     local node
-    if tree.cwd == toplevel then
+    if utils.str_find(tree.cwd, toplevel) then
       node = { entries = tree.entries, absolute_path = tree.cwd }
     else
-      node = require'nvim-tree.utils'.find_node(tree.entries, function(n)
+      node = utils.find_node(tree.entries, function(n)
         return toplevel == n.absolute_path or vim.startswith(n.absolute_path, toplevel)
       end)
     end

lua/nvim-tree/git/runner.lua

@@ -19,7 +19,7 @@ end
 -- @param cwd: {string} root cwd
 -- @returns {string} or {nil}
 local function handle_incoming_data(db, p_data, data, cwd)
-  if data and vim.fn.stridx(data, '\n') ~= -1 then
+  if data and utils.str_find(data, '\n') then
     local prev = p_data..data
     local i = 0
     for line in prev:gmatch('[^\n]*\n') do

lua/nvim-tree/lib.lua

@@ -79,7 +79,7 @@ local function get_line_from_node(node, find_parent)
   local function iter(entries, recursive)
     for _, entry in ipairs(entries) do
       local n = M.get_last_group_node(entry)
-      if node_path:match('^'..n.match_path..'$') ~= nil then
+      if node_path == n.absolute_path then
         return line, entry
       end
 
@@ -186,41 +186,50 @@ function M.set_index_and_redraw(fname)
   else
     i = 1
   end
-  local tree_altered = false
 
-  local function iter(entries)
-    for _, entry in ipairs(entries) do
+  local should_redraw = false
+
+  local new_git_toplevels = {}
+
+  local function iterate_nodes(nodes)
+    for _, node in ipairs(nodes) do
       i = i + 1
-      if entry.absolute_path == fname then
+      if node.absolute_path == fname then
         return i
       end
 
-      if fname:match(entry.match_path..utils.path_separator) ~= nil then
-        git.set_toplevel(entry.absolute_path)
-        if #entry.entries == 0 then
-          populate(entry.entries, entry.absolute_path, entry)
-          tree_altered = true
+      local path_matches = utils.str_find(fname, node.absolute_path)
+      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
+          should_redraw = true
         end
-        if entry.open == false then
-          entry.open = true
-          tree_altered = true
+        if node.open == false then
+          node.open = true
+          should_redraw = true
         end
-        if iter(entry.entries) ~= nil then
+        if iterate_nodes(node.entries) ~= nil then
           return i
         end
-      elseif entry.open == true then
-        iter(entry.entries)
+      elseif node.open == true then
+        iterate_nodes(node.entries)
       end
     end
   end
 
-  local index = iter(M.Tree.entries)
+  local index = iterate_nodes(M.Tree.entries)
   if not view.win_open() then
     return
   end
-  if tree_altered then
+  if should_redraw then
     M.redraw()
-    git.reload()
   end
   if index then
     view.set_cursor({index, 0})
@@ -483,7 +492,7 @@ function M.sibling(node, direction)
 
   -- Check if current node is already at root entries
   for index, entry in ipairs(M.Tree.entries) do
-    if node_path:match('^'..entry.match_path..'$') ~= nil then
+    if node_path == entry.absolute_path then
       line = index
     end
   end

lua/nvim-tree/populate.lua

@@ -1,14 +1,13 @@
 local api = vim.api
 local luv = vim.loop
 
+local utils = require'nvim-tree.utils'
+
 local M = {
   show_ignored = false,
   show_dotfiles = vim.g.nvim_tree_hide_dotfiles ~= 1,
 }
 
-local utils = require'nvim-tree.utils'
-local path_to_matching_str = utils.path_to_matching_str
-
 local function dir_new(cwd, name)
   local absolute_path = utils.path_join({cwd, name})
   local stat = luv.fs_stat(absolute_path)
@@ -26,8 +25,6 @@ local function dir_new(cwd, name)
     absolute_path = absolute_path,
     -- TODO: last modified could also involve atime and ctime
     last_modified = last_modified,
-    match_name = path_to_matching_str(name),
-    match_path = path_to_matching_str(absolute_path),
     open = false,
     group_next = nil,   -- If node is grouped, this points to the next child dir/link node
     has_children = has_children,
@@ -43,8 +40,6 @@ local function file_new(cwd, name)
     absolute_path = absolute_path,
     executable = is_exec,
     extension = string.match(name, ".?[^.]+%.(.*)") or "",
-    match_name = path_to_matching_str(name),
-    match_path = path_to_matching_str(absolute_path),
   }
 end
 
@@ -78,8 +73,6 @@ local function link_new(cwd, name)
     open = open,
     group_next = nil,   -- If node is grouped, this points to the next child dir/link node
     entries = entries,
-    match_name = path_to_matching_str(name),
-    match_path = path_to_matching_str(absolute_path),
   }
 end
 

lua/nvim-tree/utils.lua

@@ -12,6 +12,10 @@ function M.echo_warning(msg)
   api.nvim_command('echohl None')
 end
 
+function M.str_find(haystack, needle)
+  return vim.fn.stridx(haystack, needle) ~= -1
+end
+
 function M.read_file(path)
   local fd = uv.fs_open(path, "r", 438)
   if not fd then return '' end