Skip to content

feat(#2369): Add webdev_colors_folder option #2375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Aug 26, 2023
Merged

feat(#2369): Add webdev_colors_folder option #2375

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cc5c5e8
Add `webdev_colors_folder` option
antoniosarosi Aug 14, 2023
5d26121
Check if `M.devicons` exists
antoniosarosi Aug 15, 2023
f5c7207
Refactor `get_folder_icon`
antoniosarosi Aug 15, 2023
f3783d3
Merge branch 'master' into master
alex-courtis Aug 20, 2023
4d596b3
Add configuration options for both files and folders
antoniosarosi Aug 21, 2023
731ccd9
Merge branch 'nvim-tree:master' into master
antoniosarosi Aug 21, 2023
6ce79fc
Merge branch 'master' of github.com:antoniosarosi/nvim-tree.lua
antoniosarosi Aug 21, 2023
e4c123b
Merge branch 'master' into master
alex-courtis Aug 26, 2023
6a04a25
web_devicons.*.enabled -> enable
alex-courtis Aug 26, 2023
67e0e3c
silent migration: renderer.icons.webdev_colors -> renderer.icons.web_…
alex-courtis Aug 26, 2023
37182ed
silent migration: renderer.icons.webdev_colors -> renderer.icons.web_…
alex-courtis Aug 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lua/nvim-tree.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,7 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
},
icons = {
webdev_colors = true,
webdev_colors_folder = false,
git_placement = "before",
modified_placement = "after",
padding = " ",
Expand Down
5 changes: 2 additions & 3 deletions lua/nvim-tree/renderer/builder.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,10 @@ end
---@return HighlightedString icon, HighlightedString name
function Builder:_build_folder(node)
local has_children = #node.nodes ~= 0 or node.has_children
local icon = icons.get_folder_icon(node.open, node.link_to ~= nil, has_children)
local icon, icon_hl = icons.get_folder_icon(node, has_children)
local foldername = get_folder_name(node) .. self.trailing_slash

local icon_hl
if #icon > 0 then
if #icon > 0 and icon_hl == nil then
if node.open then
icon_hl = "NvimTreeOpenedFolderIcon"
else
Expand Down
16 changes: 12 additions & 4 deletions lua/nvim-tree/renderer/components/icons.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,21 @@ local function empty()
return ""
end

local function get_folder_icon(open, is_symlink, has_children)
local function get_folder_icon(node, has_children)
if M.config.webdev_colors_folder then
local icon, icon_hl = M.devicons.get_icon(node.name, node.extension)
if icon ~= nil then
return icon, icon_hl
end
end

local is_symlink = node.links_to ~= nil
local n
if is_symlink and open then
if is_symlink and node.open then
n = M.config.glyphs.folder.symlink_open
elseif is_symlink then
n = M.config.glyphs.folder.symlink
elseif open then
elseif node.open then
if has_children then
n = M.config.glyphs.folder.open
else
Expand All @@ -28,7 +36,7 @@ local function get_folder_icon(open, is_symlink, has_children)
n = M.config.glyphs.folder.empty
end
end
return n
return n, nil
end

local function get_file_icon_default()
Expand Down