From fd46f4f4dfd2a4d439831978b1ce3958197b1779 Mon Sep 17 00:00:00 2001 From: Bastian Ahrens Date: Tue, 22 Nov 2022 11:51:13 +0100 Subject: [PATCH 1/3] feat: Add highlight group for opened folder closes #1674 --- doc/nvim-tree-lua.txt | 1 + lua/nvim-tree/colors.lua | 1 + lua/nvim-tree/renderer/builder.lua | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/nvim-tree-lua.txt b/doc/nvim-tree-lua.txt index 483415d54ec..d0d5486c509 100644 --- a/doc/nvim-tree-lua.txt +++ b/doc/nvim-tree-lua.txt @@ -1406,6 +1406,7 @@ NvimTreeSymlink NvimTreeFolderName (Directory) NvimTreeRootFolder NvimTreeFolderIcon +NvimTreeOpenedFolderIcon NvimTreeFileIcon NvimTreeEmptyFolderName (Directory) NvimTreeOpenedFolderName (Directory) diff --git a/lua/nvim-tree/colors.lua b/lua/nvim-tree/colors.lua index 6e6a98d1807..97442637ddb 100644 --- a/lua/nvim-tree/colors.lua +++ b/lua/nvim-tree/colors.lua @@ -61,6 +61,7 @@ local function get_links() FolderName = "Directory", EmptyFolderName = "Directory", OpenedFolderName = "Directory", + OpenedFolderIcon = "NvimTreeFolderIcon", Normal = "Normal", NormalNC = "NvimTreeNormal", EndOfBuffer = "EndOfBuffer", diff --git a/lua/nvim-tree/renderer/builder.lua b/lua/nvim-tree/renderer/builder.lua index acb1d8eab12..123d931b26b 100644 --- a/lua/nvim-tree/renderer/builder.lua +++ b/lua/nvim-tree/renderer/builder.lua @@ -125,7 +125,11 @@ function Builder:_build_folder(node, padding, git_hl, git_icons_tbl) self:_insert_line(line) if #icon > 0 then - self:_insert_highlight("NvimTreeFolderIcon", offset, offset + #icon) + if node.open then + self:_insert_highlight("NvimTreeFolderOpenIcon", offset, offset + #icon) + else + self:_insert_highlight("NvimTreeFolderClosedIcon", offset, offset + #icon) + end end local foldername_hl = "NvimTreeFolderName" From 3edc7b00e2d3e4c93c1e0ae8e0d387ae59fa6ca6 Mon Sep 17 00:00:00 2001 From: Bastian Ahrens Date: Sat, 26 Nov 2022 08:51:27 +0100 Subject: [PATCH 2/3] docs: Add NvimTreeOpenedFolderIcon default --- doc/nvim-tree-lua.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/nvim-tree-lua.txt b/doc/nvim-tree-lua.txt index d0d5486c509..d8cdcc026c5 100644 --- a/doc/nvim-tree-lua.txt +++ b/doc/nvim-tree-lua.txt @@ -1406,7 +1406,7 @@ NvimTreeSymlink NvimTreeFolderName (Directory) NvimTreeRootFolder NvimTreeFolderIcon -NvimTreeOpenedFolderIcon +NvimTreeOpenedFolderIcon (NvimTreeFolderIcon) NvimTreeFileIcon NvimTreeEmptyFolderName (Directory) NvimTreeOpenedFolderName (Directory) From 49dddad0b51770839d14cb082b0d23d3df6446ca Mon Sep 17 00:00:00 2001 From: Bastian Ahrens Date: Sun, 27 Nov 2022 12:33:34 +0100 Subject: [PATCH 3/3] feat: Add NvimTreeClosedFolderIcon highlight group Defaults to NvimTreeFolderIcon --- doc/nvim-tree-lua.txt | 1 + lua/nvim-tree/colors.lua | 1 + lua/nvim-tree/renderer/builder.lua | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/nvim-tree-lua.txt b/doc/nvim-tree-lua.txt index d8cdcc026c5..4050f296495 100644 --- a/doc/nvim-tree-lua.txt +++ b/doc/nvim-tree-lua.txt @@ -1407,6 +1407,7 @@ NvimTreeFolderName (Directory) NvimTreeRootFolder NvimTreeFolderIcon NvimTreeOpenedFolderIcon (NvimTreeFolderIcon) +NvimTreeClosedFolderIcon (NvimTreeFolderIcon) NvimTreeFileIcon NvimTreeEmptyFolderName (Directory) NvimTreeOpenedFolderName (Directory) diff --git a/lua/nvim-tree/colors.lua b/lua/nvim-tree/colors.lua index 97442637ddb..33af05c0e5e 100644 --- a/lua/nvim-tree/colors.lua +++ b/lua/nvim-tree/colors.lua @@ -62,6 +62,7 @@ local function get_links() EmptyFolderName = "Directory", OpenedFolderName = "Directory", OpenedFolderIcon = "NvimTreeFolderIcon", + ClosedFolderIcon = "NvimTreeFolderIcon", Normal = "Normal", NormalNC = "NvimTreeNormal", EndOfBuffer = "EndOfBuffer", diff --git a/lua/nvim-tree/renderer/builder.lua b/lua/nvim-tree/renderer/builder.lua index 123d931b26b..c1b5e389bc8 100644 --- a/lua/nvim-tree/renderer/builder.lua +++ b/lua/nvim-tree/renderer/builder.lua @@ -126,9 +126,9 @@ function Builder:_build_folder(node, padding, git_hl, git_icons_tbl) if #icon > 0 then if node.open then - self:_insert_highlight("NvimTreeFolderOpenIcon", offset, offset + #icon) + self:_insert_highlight("NvimTreeOpenedFolderIcon", offset, offset + #icon) else - self:_insert_highlight("NvimTreeFolderClosedIcon", offset, offset + #icon) + self:_insert_highlight("NvimTreeClosedFolderIcon", offset, offset + #icon) end end