From 5736db5db3d21f0a6fd90a0d71b45eabd86b04d8 Mon Sep 17 00:00:00 2001
From: chomosuke <a13323600@gmail.com>
Date: Wed, 30 Nov 2022 03:35:00 +1100
Subject: [PATCH] coding style

---
 lua/nvim-tree/explorer/common.lua         | 15 ++--
 lua/nvim-tree/renderer/components/git.lua | 92 +++++++++--------------
 2 files changed, 44 insertions(+), 63 deletions(-)

diff --git a/lua/nvim-tree/explorer/common.lua b/lua/nvim-tree/explorer/common.lua
index 71eae8af..5f773fac 100644
--- a/lua/nvim-tree/explorer/common.lua
+++ b/lua/nvim-tree/explorer/common.lua
@@ -22,20 +22,19 @@ function M.has_one_child_folder(node)
 end
 
 function M.update_git_status(node, parent_ignored, status)
-  -- status of the node's absolute path
+  local get_status
   if node.nodes then
-    node.git_status = get_dir_git_status(parent_ignored, status, node.absolute_path)
+    get_status = get_dir_git_status
   else
-    node.git_status = get_git_status(parent_ignored, status, node.absolute_path)
+    get_status = get_git_status
   end
 
+  -- status of the node's absolute path
+  node.git_status = get_status(parent_ignored, status, node.absolute_path)
+
   -- status of the link target, if the link itself is not dirty
   if node.link_to and not node.git_status then
-    if node.nodes then
-      node.git_status = get_dir_git_status(parent_ignored, status, node.link_to)
-    else
-      node.git_status = get_git_status(parent_ignored, status, node.link_to)
-    end
+    node.git_status = get_status(parent_ignored, status, node.link_to)
   end
 end
 
diff --git a/lua/nvim-tree/renderer/components/git.lua b/lua/nvim-tree/renderer/components/git.lua
index fae22803..64a97b52 100644
--- a/lua/nvim-tree/renderer/components/git.lua
+++ b/lua/nvim-tree/renderer/components/git.lua
@@ -6,63 +6,45 @@ local M = {
 }
 
 local function build_icons_table(i)
+  local icons = {
+    staged = { icon = i.staged, hl = "NvimTreeGitStaged" },
+    unstaged = { icon = i.unstaged, hl = "NvimTreeGitDirty" },
+    untracked = { icon = i.untracked, hl = "NvimTreeGitNew" },
+    unmerged = { icon = i.unmerged, hl = "NvimTreeGitMerge" },
+    deleted = { icon = i.deleted, hl = "NvimTreeGitDeleted" },
+    ignored = { icon = i.ignored, hl = "NvimTreeGitIgnored" },
+  }
   return {
-    ["M "] = { { icon = i.staged, hl = "NvimTreeGitStaged" } },
-    [" M"] = { { icon = i.unstaged, hl = "NvimTreeGitDirty" } },
-    ["C "] = { { icon = i.staged, hl = "NvimTreeGitStaged" } },
-    [" C"] = { { icon = i.unstaged, hl = "NvimTreeGitDirty" } },
-    ["CM"] = { { icon = i.unstaged, hl = "NvimTreeGitDirty" } },
-    [" T"] = { { icon = i.unstaged, hl = "NvimTreeGitDirty" } },
-    ["T "] = { { icon = i.staged, hl = "NvimTreeGitStaged" } },
-    ["MM"] = {
-      { icon = i.staged, hl = "NvimTreeGitStaged" },
-      { icon = i.unstaged, hl = "NvimTreeGitDirty" },
-    },
-    ["MD"] = {
-      { icon = i.staged, hl = "NvimTreeGitStaged" },
-    },
-    ["A "] = {
-      { icon = i.staged, hl = "NvimTreeGitStaged" },
-    },
-    ["AD"] = {
-      { icon = i.staged, hl = "NvimTreeGitStaged" },
-    },
-    [" A"] = {
-      { icon = i.untracked, hl = "NvimTreeGitNew" },
-    },
+    ["M "] = { icons.staged },
+    [" M"] = { icons.unstaged },
+    ["C "] = { icons.staged },
+    [" C"] = { icons.unstaged },
+    ["CM"] = { icons.unstaged },
+    [" T"] = { icons.unstaged },
+    ["T "] = { icons.staged },
+    ["MM"] = { icons.staged, icons.unstaged },
+    ["MD"] = { icons.staged },
+    ["A "] = { icons.staged },
+    ["AD"] = { icons.staged },
+    [" A"] = { icons.untracked },
     -- not sure about this one
-    ["AA"] = {
-      { icon = i.unmerged, hl = "NvimTreeGitMerge" },
-      { icon = i.untracked, hl = "NvimTreeGitNew" },
-    },
-    ["AU"] = {
-      { icon = i.unmerged, hl = "NvimTreeGitMerge" },
-      { icon = i.untracked, hl = "NvimTreeGitNew" },
-    },
-    ["AM"] = {
-      { icon = i.staged, hl = "NvimTreeGitStaged" },
-      { icon = i.unstaged, hl = "NvimTreeGitDirty" },
-    },
-    ["??"] = { { icon = i.untracked, hl = "NvimTreeGitNew" } },
-    ["R "] = { { icon = i.renamed, hl = "NvimTreeGitRenamed" } },
-    [" R"] = { { icon = i.renamed, hl = "NvimTreeGitRenamed" } },
-    ["RM"] = {
-      { icon = i.unstaged, hl = "NvimTreeGitDirty" },
-      { icon = i.renamed, hl = "NvimTreeGitRenamed" },
-    },
-    ["UU"] = { { icon = i.unmerged, hl = "NvimTreeGitMerge" } },
-    ["UD"] = { { icon = i.unmerged, hl = "NvimTreeGitMerge" } },
-    ["UA"] = { { icon = i.unmerged, hl = "NvimTreeGitMerge" } },
-    [" D"] = { { icon = i.deleted, hl = "NvimTreeGitDeleted" } },
-    ["D "] = { { icon = i.deleted, hl = "NvimTreeGitDeleted" } },
-    ["RD"] = { { icon = i.deleted, hl = "NvimTreeGitDeleted" } },
-    ["DD"] = { { icon = i.deleted, hl = "NvimTreeGitDeleted" } },
-    ["DU"] = {
-      { icon = i.deleted, hl = "NvimTreeGitDeleted" },
-      { icon = i.unmerged, hl = "NvimTreeGitMerge" },
-    },
-    ["!!"] = { { icon = i.ignored, hl = "NvimTreeGitIgnored" } },
-    dirty = { { icon = i.unstaged, hl = "NvimTreeGitDirty" } },
+    ["AA"] = { icons.unmerged, icons.untracked },
+    ["AU"] = { icons.unmerged, icons.untracked },
+    ["AM"] = { icons.staged, icons.unstaged },
+    ["??"] = { icons.untracked },
+    ["R "] = { icons.renamed },
+    [" R"] = { icons.renamed },
+    ["RM"] = { icons.unstaged, icons.renamed },
+    ["UU"] = { icons.unmerged },
+    ["UD"] = { icons.unmerged },
+    ["UA"] = { icons.unmerged },
+    [" D"] = { icons.deleted },
+    ["D "] = { icons.deleted },
+    ["RD"] = { icons.deleted },
+    ["DD"] = { icons.deleted },
+    ["DU"] = { icons.deleted, icons.unmerged },
+    ["!!"] = { icons.ignored },
+    dirty = { icons.unstaged },
   }
 end