update git status of links

Author: alex-courtis

lua/nvim-tree/git/init.lua

@@ -283,32 +283,35 @@ function M.load_project_status(path)
   end
 end
 
+---Git file and directory status for an absolute path with optional file fallback
 ---@param parent_ignored boolean
 ---@param status table|nil
----@param absolute_path string
+---@param path string
+---@param path_file string? alternative file path when no other file status
 ---@return GitStatus|nil
-function M.git_status_dir(parent_ignored, status, absolute_path)
+function M.git_status_dir(parent_ignored, status, path, path_file)
   if parent_ignored then
     return { file = "!!" }
   end
 
   if status then
     return {
-      file = status.files and status.files[absolute_path],
+      file = status.files and status.files[path] or path_file and status.files[path_file],
       dir = status.dirs and {
-        direct = status.dirs.direct[absolute_path],
-        indirect = status.dirs.indirect[absolute_path],
+        direct = status.dirs.direct[path],
+        indirect = status.dirs.indirect[path],
       },
     }
   end
 end
 
----Git file status for an absolute path
+---Git file status for an absolute path with optional fallback
 ---@param parent_ignored boolean
 ---@param status table|nil
----@param absolute_paths string[] status for first match is returned
+---@param path string
+---@param path_fallback string?
 ---@return GitStatus
-function M.git_status_file(parent_ignored, status, absolute_paths)
+function M.git_status_file(parent_ignored, status, path, path_fallback)
   if parent_ignored then
     return { file = "!!" }
   end
@@ -317,14 +320,9 @@ function M.git_status_file(parent_ignored, status, absolute_paths)
     return {}
   end
 
-  for _, p in ipairs(absolute_paths) do
-    local s = status.files[p]
-    if s then
-      return { file = s }
-    end
-  end
-
-  return {}
+  return {
+    file = status.files[path] or status.files[path_fallback]
+  }
 end
 
 function M.purge_state()

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

@@ -32,11 +32,11 @@ function DirectoryLinkNode:create(explorer, parent, absolute_path, link_to, name
   return o
 end
 
------Update the GitStatus of link target
+-----Update the directory GitStatus of link target and the file status of the link itself
 -----@param parent_ignored boolean
 -----@param status table|nil
 function DirectoryLinkNode:update_git_status(parent_ignored, status)
-  self.git_status = git.git_status_dir(parent_ignored, status, self.link_to)
+  self.git_status = git.git_status_dir(parent_ignored, status, self.link_to, self.absolute_path)
 end
 
 ---Create a sanitized partial copy of a node, populating children recursively.

lua/nvim-tree/node/directory.lua

@@ -59,11 +59,11 @@ function DirectoryNode:destroy()
   end
 end
 
----Update the GitStatus of absolute path of the directory
+---Update the GitStatus of the directory
 ---@param parent_ignored boolean
 ---@param status table|nil
 function DirectoryNode:update_git_status(parent_ignored, status)
-  self.git_status = git.git_status_dir(parent_ignored, status, self.absolute_path)
+  self.git_status = git.git_status_dir(parent_ignored, status, self.absolute_path, nil)
 end
 
 ---@return GitStatus|nil

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

@@ -32,7 +32,7 @@ end
 -----@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.absolute_path, })
+  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

@@ -41,7 +41,7 @@ end
 ---@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, nil)
 end
 
 ---@return GitStatus|nil