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

fix: folder icon highlight (#1086)

Browse Source
This commit is contained in:
Gary Sentosa
2022-03-18 19:34:11 +09:00
committed by GitHub
parent e307ad9e3d
commit ecbe3ade95
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lua/nvim-tree/renderer/init.lua
View File

@@ -24,7 +24,7 @@ local function get_trailing_length()
return vim.g.nvim_tree_add_trailing and 1 or 0 return vim.g.nvim_tree_add_trailing and 1 or 0
end end
local set_folder_hl = function(line, depth, git_icon_len, _, hl_group) local set_folder_hl = function(line, depth, git_icon_len, _, hl_group, _)
table.insert(hl, { hl_group, line, depth + git_icon_len, -1 }) table.insert(hl, { hl_group, line, depth + git_icon_len, -1 })
end end
@@ -52,10 +52,10 @@ if icon_state.show_folder_icon then
end end
return n .. icon_padding return n .. icon_padding
end end
set_folder_hl = function(line, depth, icon_len, name_len, hl_group) set_folder_hl = function(line, depth, icon_len, name_len, hl_icongroup, hl_fnamegroup)
table.insert(hl, { hl_group, line, depth + icon_len, depth + icon_len + name_len + get_trailing_length() }) local hl_icon = should_hl_opened_files and hl_icongroup or "NvimTreeFolderIcon"
local hl_icon = (vim.g.nvim_tree_highlight_opened_files or 0) ~= 0 and hl_group or "NvimTreeFolderIcon"
table.insert(hl, { hl_icon, line, depth, depth + icon_len }) table.insert(hl, { hl_icon, line, depth, depth + icon_len })
table.insert(hl, { hl_fnamegroup, line, depth + icon_len, depth + icon_len + name_len + get_trailing_length() })
end end
end end
@@ -156,9 +156,9 @@ local function update_draw_data(tree, depth, markers)
if special[node.absolute_path] then if special[node.absolute_path] then
folder_hl = "NvimTreeSpecialFolderName" folder_hl = "NvimTreeSpecialFolderName"
end end
set_folder_hl(index, offset, #icon + #git_icon, #name, folder_hl) set_folder_hl(index, offset, #icon + #git_icon, #name, "NvimTreeFolderIcon", folder_hl)
if git_hl then if git_hl then
set_folder_hl(index, offset, #icon + #git_icon, #name, git_hl) set_folder_hl(index, offset, #icon + #git_icon, #name, git_hl, git_hl)
end end
index = index + 1 index = index + 1
if node.open then if node.open then