From b933ae856f567081c5e97acda76ead7c49cb06fa Mon Sep 17 00:00:00 2001 From: kiyan Date: Sat, 10 Jul 2021 10:27:53 +0200 Subject: [PATCH] fix(git): add DD and AU git statuses --- lua/nvim-tree/renderer.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lua/nvim-tree/renderer.lua b/lua/nvim-tree/renderer.lua index c23a77ca..6b8e915d 100644 --- a/lua/nvim-tree/renderer.lua +++ b/lua/nvim-tree/renderer.lua @@ -105,6 +105,10 @@ if vim.g.nvim_tree_git_hl == 1 then { hl = "NvimTreeFileStaged" }, { hl = "NvimTreeFileNew" } }, + ["AU"] = { + { hl = "NvimTreeFileMerge" }, + { hl = "NvimTreeFileStaged" }, + }, -- not sure about this one ["AA"] = { { hl = "NvimTreeFileMerge" }, @@ -126,6 +130,7 @@ if vim.g.nvim_tree_git_hl == 1 then ["UU"] = { { hl = "NvimTreeFileMerge" } }, ["UD"] = { { hl = "NvimTreeFileMerge" } }, [" D"] = { { hl = "NvimTreeFileDeleted" } }, + ["DD"] = { { hl = "NvimTreeFileDeleted" } }, ["D "] = { { hl = "NvimTreeFileDeleted" }, { hl = "NvimTreeFileStaged" } @@ -182,6 +187,10 @@ if icon_state.show_git_icon then { icon = icon_state.icons.git_icons.unmerged, hl = "NvimTreeGitMerge" }, { icon = icon_state.icons.git_icons.untracked, hl = "NvimTreeGitNew" }, }, + ["AU"] = { + { icon = icon_state.icons.git_icons.unmerged, hl = "NvimTreeGitMerge" }, + { icon = icon_state.icons.git_icons.untracked, hl = "NvimTreeGitNew" }, + }, ["AM"] = { { icon = icon_state.icons.git_icons.staged, hl = "NvimTreeGitStaged" }, { icon = icon_state.icons.git_icons.unstaged, hl = "NvimTreeGitDirty" } @@ -196,6 +205,7 @@ if icon_state.show_git_icon then ["UD"] = { { icon = icon_state.icons.git_icons.unmerged, hl = "NvimTreeGitMerge" } }, [" D"] = { { icon = icon_state.icons.git_icons.deleted, hl = "NvimTreeGitDeleted" } }, ["D "] = { { icon = icon_state.icons.git_icons.deleted, hl = "NvimTreeGitDeleted" } }, + ["DD"] = { { icon = icon_state.icons.git_icons.deleted, hl = "NvimTreeGitDeleted" } }, ["DU"] = { { icon = icon_state.icons.git_icons.deleted, hl = "NvimTreeGitDeleted" }, { icon = icon_state.icons.git_icons.unmerged, hl = "NvimTreeGitMerge" },