git.git_status_file takes an array

Author: alex-courtis

lua/nvim-tree/git/init.lua

@@ -303,13 +303,28 @@ function M.git_status_dir(parent_ignored, status, absolute_path)
   end
 end
 
+---Git file status for an absolute path
 ---@param parent_ignored boolean
 ---@param status table|nil
----@param absolute_path string
+---@param absolute_paths string[] status for first match is returned
 ---@return GitStatus
-function M.git_status_file(parent_ignored, status, absolute_path)
-  local file_status = parent_ignored and "!!" or (status and status.files and status.files[absolute_path])
-  return { file = file_status }
+function M.git_status_file(parent_ignored, status, absolute_paths)
+  if parent_ignored then
+    return { file = "!!" }
+  end
+
+  if not status or not status.files then
+    return {}
+  end
+
+  for _, p in ipairs(absolute_paths) do
+    local s = status.files[p]
+    if s then
+      return { file = s }
+    end
+  end
+
+  return {}
 end
 
 function M.purge_state()

lua/nvim-tree/node/file-link.lua

@@ -28,11 +28,11 @@ function FileLinkNode:create(explorer, parent, absolute_path, link_to, name, fs_
   return o
 end
 
------Update the GitStatus of link target
+-----Update the GitStatus of the target otherwise the link itself
 -----@param parent_ignored boolean
 -----@param status table|nil
 function FileLinkNode:update_git_status(parent_ignored, status)
-  self.git_status = git.git_status_file(parent_ignored, status, self.link_to)
+  self.git_status = git.git_status_file(parent_ignored, status, { self.link_to, self.absolute_path, })
 end
 
 ---Create a sanitized partial copy of a node

lua/nvim-tree/node/file.lua

@@ -37,11 +37,11 @@ function FileNode:create(explorer, parent, absolute_path, name, fs_stat)
   return o
 end
 
----Update the GitStatus of absolute path of the file
+---Update the GitStatus of the file
 ---@param parent_ignored boolean
 ---@param status table|nil
 function FileNode:update_git_status(parent_ignored, status)
-  self.git_status = git.git_status_file(parent_ignored, status, self.absolute_path)
+  self.git_status = git.git_status_file(parent_ignored, status, { self.absolute_path })
 end
 
 ---@return GitStatus|nil