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

refactor(renderer): remove set_folder_hl function from icons

Browse Source 
This greatly simplifies the folder highlighting logic. It wasn't clear
before and the code was probably doing more than it should. The logic
with highlight_opened_file wasn't working at all, so i just removed it.
This should allow us to greatly extend the order in which the components
are rendered.
This commit is contained in:
kiyan
2022-04-26 22:28:40 +02:00
parent d8fe48a887
commit 0d6c0dda3d
2 changed files with 15 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lua/nvim-tree/renderer/components/icons.lua
View File

@@ -11,14 +11,6 @@ local function empty()
return ""
end
local function get_trailing_length()
return vim.g.nvim_tree_add_trailing and 1 or 0
end
local function set_folder_hl_default(line, depth, git_icon_len, _, hl_group, _, hl)
table.insert(hl, { hl_group, line, depth + git_icon_len, -1 })
end
local function get_folder_icon(open, is_symlink, has_children)
local n
if is_symlink and open then
@@ -41,12 +33,6 @@ local function get_folder_icon(open, is_symlink, has_children)
return n .. M.padding
end
local function set_folder_hl(line, depth, icon_len, name_len, hl_icongroup, hl_fnamegroup, hl, should_hl_opened_files)
local hl_icon = should_hl_opened_files and hl_icongroup or "NvimTreeFolderIcon"
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
local function get_file_icon_default()
local hl_group = "NvimTreeFileIcon"
local icon = M.icons.default
@@ -95,10 +81,8 @@ end
local function config_folder_icon()
if M.configs.show_folder_icon then
M.get_folder_icon = get_folder_icon
M.set_folder_hl = set_folder_hl
else
M.get_folder_icon = empty
M.set_folder_hl = set_folder_hl_default
end
end