tomas.mirchev/nvim-tree.lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(git): add DD and AU git statuses

Browse Source
This commit is contained in:
kiyan
2021-07-10 10:27:53 +02:00
parent 64aacb67ab
commit b933ae856f
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lua/nvim-tree/renderer.lua
View File

@@ -105,6 +105,10 @@ if vim.g.nvim_tree_git_hl == 1 then
{ hl = "NvimTreeFileStaged" }, { hl = "NvimTreeFileStaged" },
{ hl = "NvimTreeFileNew" } { hl = "NvimTreeFileNew" }
}, },
["AU"] = {
{ hl = "NvimTreeFileMerge" },
{ hl = "NvimTreeFileStaged" },
},
-- not sure about this one -- not sure about this one
["AA"] = { ["AA"] = {
{ hl = "NvimTreeFileMerge" }, { hl = "NvimTreeFileMerge" },
@@ -126,6 +130,7 @@ if vim.g.nvim_tree_git_hl == 1 then
["UU"] = { { hl = "NvimTreeFileMerge" } }, ["UU"] = { { hl = "NvimTreeFileMerge" } },
["UD"] = { { hl = "NvimTreeFileMerge" } }, ["UD"] = { { hl = "NvimTreeFileMerge" } },
[" D"] = { { hl = "NvimTreeFileDeleted" } }, [" D"] = { { hl = "NvimTreeFileDeleted" } },
["DD"] = { { hl = "NvimTreeFileDeleted" } },
["D "] = { ["D "] = {
{ hl = "NvimTreeFileDeleted" }, { hl = "NvimTreeFileDeleted" },
{ hl = "NvimTreeFileStaged" } { 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.unmerged, hl = "NvimTreeGitMerge" },
{ icon = icon_state.icons.git_icons.untracked, hl = "NvimTreeGitNew" }, { 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"] = { ["AM"] = {
{ icon = icon_state.icons.git_icons.staged, hl = "NvimTreeGitStaged" }, { icon = icon_state.icons.git_icons.staged, hl = "NvimTreeGitStaged" },
{ icon = icon_state.icons.git_icons.unstaged, hl = "NvimTreeGitDirty" } { 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" } }, ["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" } },
["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"] = { ["DU"] = {
{ icon = icon_state.icons.git_icons.deleted, hl = "NvimTreeGitDeleted" }, { icon = icon_state.icons.git_icons.deleted, hl = "NvimTreeGitDeleted" },
{ icon = icon_state.icons.git_icons.unmerged, hl = "NvimTreeGitMerge" }, { icon = icon_state.icons.git_icons.unmerged, hl = "NvimTreeGitMerge" },