* feat(#2415): granular highlight_diagnostics, normalise groups (#2454) * chore: normalise colours and enable cterm (#2471) * feat(#2415): granular highlight_git, normalise git groups (#2487) * docs: update CONTRIBUTING.md (#2485) * feat(#2415): granular highlight_git, normalise git groups * feat(#2415): normalise and add modified groups * feat(#2415): create Decorator class for modified and bookmarks * feat(#2415): create DecoratorDiagnostics * feat(#2415): create DecoratorGit * feat(#2415): create DecoratorGit * add DecoratorCopied DecoratorCut * add DecoratorOpened * remove unloaded_bufnr checks as the view debouncer takes care of it * Add `renderer.highlight_git` to accepted strings * fix(#2415): builder refactor (#2538) * simplify builder signs * decorators take care of themselves and are priority ordered * simplify builder hl groups * refactor builder for icon arrays * builder use decorators generically * fix(#2415): harden sign creation (#2539) * fix(#2415): harden unicode signs * Decorator tidy * normalise git sign creation and tidy * tidy builder * NvimTreeBookmarkIcon * tidy HL doc * tidy HL doc * tidy HL doc * tidy builder doc * standardise on '---@param' * DiagnosticWarning -> DiagnosticWarn * annotate decorators * limit to two highlight groups for line rendering * style * apply #2519 * feat(#2415): combined hl groups (#2601) * feat(#2415): create combined highlight groups * feat(#2415): create combined highlight groups * feat(#2415): create combined highlight groups * ci: allow workflow_dispatch (#2620) * one and only one hl namespace, required winhl removal * small tidies * colors.lua -> appearance.lua * full-name uses one and only namespace * don't highlight fast, just apply to namespace, safer win_set_hl * gut builder (#2622) collapse Builder * fix group_empty function check * feat(#2415): highlight-overhaul release date --------- Co-authored-by: Akmadan23 <azadahmadi@mailo.com>
This commit is contained in:
Alexander Courtis
committed by
GitHub
GitHub
parent
f24afa2cef
commit
e9c5abe073
@@ -1,136 +1,94 @@
|
||||
local utils = require "nvim-tree.utils"
|
||||
local appearance = require "nvim-tree.appearance"
|
||||
local core = require "nvim-tree.core"
|
||||
local live_filter = require "nvim-tree.live-filter"
|
||||
local notify = require "nvim-tree.notify"
|
||||
local utils = require "nvim-tree.utils"
|
||||
local view = require "nvim-tree.view"
|
||||
local log = require "nvim-tree.log"
|
||||
|
||||
local DecoratorBookmarks = require "nvim-tree.renderer.decorator.bookmarks"
|
||||
local DecoratorCopied = require "nvim-tree.renderer.decorator.copied"
|
||||
local DecoratorCut = require "nvim-tree.renderer.decorator.cut"
|
||||
local DecoratorDiagnostics = require "nvim-tree.renderer.decorator.diagnostics"
|
||||
local DecoratorGit = require "nvim-tree.renderer.decorator.git"
|
||||
local DecoratorModified = require "nvim-tree.renderer.decorator.modified"
|
||||
local DecoratorOpened = require "nvim-tree.renderer.decorator.opened"
|
||||
|
||||
local git = require "nvim-tree.renderer.components.git"
|
||||
local pad = require "nvim-tree.renderer.components.padding"
|
||||
local icons = require "nvim-tree.renderer.components.icons"
|
||||
local modified = require "nvim-tree.renderer.components.modified"
|
||||
local diagnostics = require "nvim-tree.renderer.components.diagnostics"
|
||||
local bookmarks = require "nvim-tree.renderer.components.bookmarks"
|
||||
|
||||
local HL_POSITION = require("nvim-tree.enum").HL_POSITION
|
||||
local M = {
|
||||
opts = {},
|
||||
decorators = {},
|
||||
picture_map = {
|
||||
jpg = true,
|
||||
jpeg = true,
|
||||
png = true,
|
||||
gif = true,
|
||||
webp = true,
|
||||
jxl = true,
|
||||
},
|
||||
}
|
||||
|
||||
---@class HighlightedString
|
||||
---@field str string
|
||||
---@field hl string[]
|
||||
|
||||
---@class AddHighlightArgs
|
||||
---@field group string[]
|
||||
---@field line number
|
||||
---@field col_start number
|
||||
---@field col_end number
|
||||
|
||||
---@class Builder
|
||||
---@field lines string[] includes icons etc.
|
||||
---@field hl_args AddHighlightArgs[] line highlights
|
||||
---@field signs string[] line signs
|
||||
---@field private root_cwd string absolute path
|
||||
---@field private index number
|
||||
---@field private depth number
|
||||
---@field private combined_groups string[] combined group names
|
||||
---@field private markers boolean[] indent markers
|
||||
local Builder = {}
|
||||
Builder.__index = Builder
|
||||
|
||||
local DEFAULT_ROOT_FOLDER_LABEL = ":~:s?$?/..?"
|
||||
|
||||
function Builder.new(root_cwd)
|
||||
return setmetatable({
|
||||
---@return Builder
|
||||
function Builder:new()
|
||||
local o = {
|
||||
root_cwd = core.get_cwd(),
|
||||
index = 0,
|
||||
depth = 0,
|
||||
highlights = {},
|
||||
hl_args = {},
|
||||
combined_groups = {},
|
||||
lines = {},
|
||||
markers = {},
|
||||
signs = {},
|
||||
root_cwd = root_cwd,
|
||||
}, Builder)
|
||||
}
|
||||
setmetatable(o, self)
|
||||
self.__index = self
|
||||
|
||||
return o
|
||||
end
|
||||
|
||||
function Builder:configure_root_label(root_folder_label)
|
||||
self.root_folder_label = root_folder_label or DEFAULT_ROOT_FOLDER_LABEL
|
||||
return self
|
||||
---Insert ranged highlight groups into self.highlights
|
||||
---@private
|
||||
---@param groups string[]
|
||||
---@param start number
|
||||
---@param end_ number|nil
|
||||
function Builder:insert_highlight(groups, start, end_)
|
||||
table.insert(self.hl_args, { groups, self.index, start, end_ or -1 })
|
||||
end
|
||||
|
||||
function Builder:configure_trailing_slash(with_trailing)
|
||||
self.trailing_slash = with_trailing and "/" or ""
|
||||
return self
|
||||
end
|
||||
|
||||
function Builder:configure_special_files(special_files)
|
||||
self.special_files = special_files
|
||||
return self
|
||||
end
|
||||
|
||||
function Builder:configure_picture_map(picture_map)
|
||||
self.picture_map = picture_map
|
||||
return self
|
||||
end
|
||||
|
||||
function Builder:configure_filter(filter, prefix)
|
||||
self.filter_prefix = prefix
|
||||
self.filter = filter
|
||||
return self
|
||||
end
|
||||
|
||||
function Builder:configure_opened_file_highlighting(highlight_opened_files)
|
||||
self.highlight_opened_files = highlight_opened_files
|
||||
return self
|
||||
end
|
||||
|
||||
function Builder:configure_modified_highlighting(highlight_modified)
|
||||
self.highlight_modified = highlight_modified
|
||||
return self
|
||||
end
|
||||
|
||||
function Builder:configure_icon_padding(padding)
|
||||
self.icon_padding = padding or " "
|
||||
return self
|
||||
end
|
||||
|
||||
function Builder:configure_git_icons_placement(where)
|
||||
if where ~= "after" and where ~= "before" and where ~= "signcolumn" then
|
||||
where = "before" -- default before
|
||||
end
|
||||
self.git_placement = where
|
||||
return self
|
||||
end
|
||||
|
||||
function Builder:configure_diagnostics_icon_placement(where)
|
||||
if where ~= "after" and where ~= "before" and where ~= "signcolumn" then
|
||||
where = "before" -- default before
|
||||
end
|
||||
self.diagnostics_placement = where
|
||||
return self
|
||||
end
|
||||
|
||||
function Builder:configure_bookmark_icon_placement(where)
|
||||
if where ~= "after" and where ~= "before" and where ~= "signcolumn" then
|
||||
where = "before" -- default before
|
||||
end
|
||||
self.bookmarks_placement = where
|
||||
return self
|
||||
end
|
||||
|
||||
function Builder:configure_modified_placement(where)
|
||||
if where ~= "after" and where ~= "before" and where ~= "signcolumn" then
|
||||
where = "after" -- default after
|
||||
end
|
||||
self.modified_placement = where
|
||||
return self
|
||||
end
|
||||
|
||||
function Builder:configure_symlink_destination(show)
|
||||
self.symlink_destination = show
|
||||
return self
|
||||
end
|
||||
|
||||
function Builder:configure_group_name_modifier(group_name_modifier)
|
||||
if type(group_name_modifier) == "function" then
|
||||
self.group_name_modifier = group_name_modifier
|
||||
end
|
||||
return self
|
||||
end
|
||||
|
||||
function Builder:_insert_highlight(group, start, end_)
|
||||
table.insert(self.highlights, { group, self.index, start, end_ or -1 })
|
||||
end
|
||||
|
||||
function Builder:_insert_line(line)
|
||||
table.insert(self.lines, line)
|
||||
end
|
||||
|
||||
function Builder:_get_folder_name(node)
|
||||
---@private
|
||||
function Builder:get_folder_name(node)
|
||||
local name = node.name
|
||||
local next = node.group_next
|
||||
while next do
|
||||
name = name .. "/" .. next.name
|
||||
name = string.format("%s/%s", name, next.name)
|
||||
next = next.group_next
|
||||
end
|
||||
|
||||
if node.group_next and self.group_name_modifier then
|
||||
local new_name = self.group_name_modifier(name)
|
||||
if node.group_next and type(M.opts.renderer.group_empty) == "function" then
|
||||
local new_name = M.opts.renderer.group_empty(name)
|
||||
if type(new_name) == "string" then
|
||||
name = new_name
|
||||
else
|
||||
@@ -138,16 +96,13 @@ function Builder:_get_folder_name(node)
|
||||
end
|
||||
end
|
||||
|
||||
return name .. self.trailing_slash
|
||||
return string.format("%s%s", name, M.opts.renderer.add_trailing and "/" or "")
|
||||
end
|
||||
|
||||
---@class HighlightedString
|
||||
---@field str string
|
||||
---@field hl string[]
|
||||
|
||||
---@private
|
||||
---@param highlighted_strings HighlightedString[]
|
||||
---@return string
|
||||
function Builder:_unwrap_highlighted_strings(highlighted_strings)
|
||||
function Builder:unwrap_highlighted_strings(highlighted_strings)
|
||||
if not highlighted_strings then
|
||||
return ""
|
||||
end
|
||||
@@ -156,21 +111,22 @@ function Builder:_unwrap_highlighted_strings(highlighted_strings)
|
||||
for _, v in ipairs(highlighted_strings) do
|
||||
if #v.str > 0 then
|
||||
if v.hl and type(v.hl) == "table" then
|
||||
self:_insert_highlight(v.hl, #string, #string + #v.str)
|
||||
self:insert_highlight(v.hl, #string, #string + #v.str)
|
||||
end
|
||||
string = string .. v.str
|
||||
string = string.format("%s%s", string, v.str)
|
||||
end
|
||||
end
|
||||
return string
|
||||
end
|
||||
|
||||
---@private
|
||||
---@param node table
|
||||
---@return HighlightedString icon
|
||||
---@return HighlightedString name
|
||||
function Builder:_build_folder(node)
|
||||
function Builder:build_folder(node)
|
||||
local has_children = #node.nodes ~= 0 or node.has_children
|
||||
local icon, icon_hl = icons.get_folder_icon(node, has_children)
|
||||
local foldername = self:_get_folder_name(node)
|
||||
local foldername = self:get_folder_name(node)
|
||||
|
||||
if #icon > 0 and icon_hl == nil then
|
||||
if node.open then
|
||||
@@ -181,12 +137,14 @@ function Builder:_build_folder(node)
|
||||
end
|
||||
|
||||
local foldername_hl = "NvimTreeFolderName"
|
||||
if node.link_to and self.symlink_destination then
|
||||
if node.link_to and M.opts.renderer.symlink_destination then
|
||||
local arrow = icons.i.symlink_arrow
|
||||
local link_to = utils.path_relative(node.link_to, core.get_cwd())
|
||||
foldername = foldername .. arrow .. link_to
|
||||
local link_to = utils.path_relative(node.link_to, self.root_cwd)
|
||||
foldername = string.format("%s%s%s", foldername, arrow, link_to)
|
||||
foldername_hl = "NvimTreeSymlinkFolderName"
|
||||
elseif vim.tbl_contains(self.special_files, node.absolute_path) or vim.tbl_contains(self.special_files, node.name) then
|
||||
elseif
|
||||
vim.tbl_contains(M.opts.renderer.special_files, node.absolute_path) or vim.tbl_contains(M.opts.renderer.special_files, node.name)
|
||||
then
|
||||
foldername_hl = "NvimTreeSpecialFolderName"
|
||||
elseif node.open then
|
||||
foldername_hl = "NvimTreeOpenedFolderName"
|
||||
@@ -197,174 +155,56 @@ function Builder:_build_folder(node)
|
||||
return { str = icon, hl = { icon_hl } }, { str = foldername, hl = { foldername_hl } }
|
||||
end
|
||||
|
||||
---@private
|
||||
---@param node table
|
||||
---@return HighlightedString icon
|
||||
---@return HighlightedString name
|
||||
function Builder:_build_symlink(node)
|
||||
function Builder:build_symlink(node)
|
||||
local icon = icons.i.symlink
|
||||
local arrow = icons.i.symlink_arrow
|
||||
local symlink_formatted = node.name
|
||||
if self.symlink_destination then
|
||||
local link_to = utils.path_relative(node.link_to, core.get_cwd())
|
||||
symlink_formatted = symlink_formatted .. arrow .. link_to
|
||||
if M.opts.renderer.symlink_destination then
|
||||
local link_to = utils.path_relative(node.link_to, self.root_cwd)
|
||||
symlink_formatted = string.format("%s%s%s", symlink_formatted, arrow, link_to)
|
||||
end
|
||||
|
||||
return { str = icon, hl = { "NvimTreeSymlinkIcon" } }, { str = symlink_formatted, hl = { "NvimTreeSymlink" } }
|
||||
end
|
||||
|
||||
---@param node table
|
||||
---@return HighlightedString icon
|
||||
function Builder:_build_file_icon(node)
|
||||
local icon, hl_group = icons.get_file_icon(node.name, node.extension)
|
||||
return { str = icon, hl = { hl_group } }
|
||||
end
|
||||
|
||||
---@private
|
||||
---@param node table
|
||||
---@return HighlightedString icon
|
||||
---@return HighlightedString name
|
||||
function Builder:_build_file(node)
|
||||
local icon = self:_build_file_icon(node)
|
||||
|
||||
function Builder:build_file(node)
|
||||
local hl
|
||||
if vim.tbl_contains(self.special_files, node.absolute_path) or vim.tbl_contains(self.special_files, node.name) then
|
||||
if vim.tbl_contains(M.opts.renderer.special_files, node.absolute_path) or vim.tbl_contains(M.opts.renderer.special_files, node.name) then
|
||||
hl = "NvimTreeSpecialFile"
|
||||
elseif node.executable then
|
||||
hl = "NvimTreeExecFile"
|
||||
elseif self.picture_map[node.extension] then
|
||||
elseif M.picture_map[node.extension] then
|
||||
hl = "NvimTreeImageFile"
|
||||
end
|
||||
|
||||
return icon, { str = node.name, hl = { hl } }
|
||||
end
|
||||
|
||||
---@param node table
|
||||
---@return HighlightedString[]|nil icon
|
||||
function Builder:_get_git_icons(node)
|
||||
local git_icons = git.get_icons(node)
|
||||
if git_icons and #git_icons > 0 and self.git_placement == "signcolumn" then
|
||||
table.insert(self.signs, {
|
||||
sign = git_icons[1].hl[1],
|
||||
lnum = self.index + 1,
|
||||
priority = 1,
|
||||
})
|
||||
git_icons = nil
|
||||
end
|
||||
return git_icons
|
||||
end
|
||||
|
||||
---@param node table
|
||||
---@return HighlightedString[]|nil icon
|
||||
function Builder:_get_diagnostics_icon(node)
|
||||
local diagnostics_icon = diagnostics.get_icon(node)
|
||||
if diagnostics_icon and self.diagnostics_placement == "signcolumn" then
|
||||
table.insert(self.signs, {
|
||||
sign = diagnostics_icon.hl[1],
|
||||
lnum = self.index + 1,
|
||||
priority = 2,
|
||||
})
|
||||
diagnostics_icon = nil
|
||||
end
|
||||
return diagnostics_icon
|
||||
end
|
||||
|
||||
---@param node table
|
||||
---@return HighlightedString|nil icon
|
||||
function Builder:_get_modified_icon(node)
|
||||
local modified_icon = modified.get_icon(node)
|
||||
if modified_icon and self.modified_placement == "signcolumn" then
|
||||
table.insert(self.signs, {
|
||||
sign = modified_icon.hl[1],
|
||||
lnum = self.index + 1,
|
||||
priority = 3,
|
||||
})
|
||||
modified_icon = nil
|
||||
end
|
||||
return modified_icon
|
||||
end
|
||||
|
||||
---@param node table
|
||||
---@return HighlightedString[]|nil icon
|
||||
function Builder:_get_bookmark_icon(node)
|
||||
local bookmark_icon = bookmarks.get_icon(node)
|
||||
if bookmark_icon and self.bookmarks_placement == "signcolumn" then
|
||||
table.insert(self.signs, {
|
||||
sign = bookmark_icon.hl[1],
|
||||
lnum = self.index + 1,
|
||||
priority = 4,
|
||||
})
|
||||
bookmark_icon = nil
|
||||
end
|
||||
return bookmark_icon
|
||||
end
|
||||
|
||||
---@param node table
|
||||
---@return string|nil icon_hl
|
||||
---@return string|nil name_hl
|
||||
function Builder:_get_highlight_override(node, unloaded_bufnr)
|
||||
local name_hl, icon_hl
|
||||
|
||||
-- git
|
||||
local git_highlight = git.get_highlight(node)
|
||||
if git_highlight then
|
||||
name_hl = git_highlight
|
||||
end
|
||||
|
||||
-- opened file
|
||||
if self.highlight_opened_files and vim.fn.bufloaded(node.absolute_path) > 0 and vim.fn.bufnr(node.absolute_path) ~= unloaded_bufnr then
|
||||
if self.highlight_opened_files == "all" or self.highlight_opened_files == "name" then
|
||||
name_hl = "NvimTreeOpenedFile"
|
||||
end
|
||||
if self.highlight_opened_files == "all" or self.highlight_opened_files == "icon" then
|
||||
icon_hl = "NvimTreeOpenedFileIcon"
|
||||
end
|
||||
end
|
||||
|
||||
-- modified file
|
||||
local modified_highlight = modified.get_highlight(node)
|
||||
if modified_highlight then
|
||||
if self.highlight_modified == "all" or self.highlight_modified == "name" then
|
||||
name_hl = modified_highlight
|
||||
end
|
||||
if self.highlight_modified == "all" or self.highlight_modified == "icon" then
|
||||
icon_hl = modified_highlight
|
||||
end
|
||||
end
|
||||
|
||||
return icon_hl, name_hl
|
||||
end
|
||||
|
||||
---Append optional highlighting to icon or name.
|
||||
---@param node table
|
||||
---@param get_hl fun(node: table): HL_POSITION, string
|
||||
---@param icon_hl string[] icons to append to
|
||||
---@param name_hl string[] names to append to
|
||||
function Builder:_append_highlight(node, get_hl, icon_hl, name_hl)
|
||||
local pos, hl = get_hl(node)
|
||||
if pos ~= HL_POSITION.none and hl then
|
||||
if pos == HL_POSITION.all or pos == HL_POSITION.icon then
|
||||
table.insert(icon_hl, hl)
|
||||
end
|
||||
if pos == HL_POSITION.all or pos == HL_POSITION.name then
|
||||
table.insert(name_hl, hl)
|
||||
end
|
||||
end
|
||||
local icon, hl_group = icons.get_file_icon(node.name, node.extension)
|
||||
return { str = icon, hl = { hl_group } }, { str = node.name, hl = { hl } }
|
||||
end
|
||||
|
||||
---@private
|
||||
---@param indent_markers HighlightedString[]
|
||||
---@param arrows HighlightedString[]|nil
|
||||
---@param icon HighlightedString
|
||||
---@param name HighlightedString
|
||||
---@param git_icons HighlightedString[]|nil
|
||||
---@param diagnostics_icon HighlightedString|nil
|
||||
---@param modified_icon HighlightedString|nil
|
||||
---@param bookmark_icon HighlightedString|nil
|
||||
---@param node table
|
||||
---@return HighlightedString[]
|
||||
function Builder:_format_line(indent_markers, arrows, icon, name, git_icons, diagnostics_icon, modified_icon, bookmark_icon)
|
||||
function Builder:format_line(indent_markers, arrows, icon, name, node)
|
||||
local added_len = 0
|
||||
local function add_to_end(t1, t2)
|
||||
if not t2 then
|
||||
return
|
||||
end
|
||||
for _, v in ipairs(t2) do
|
||||
if added_len > 0 then
|
||||
table.insert(t1, { str = self.icon_padding })
|
||||
table.insert(t1, { str = M.opts.renderer.icons.padding })
|
||||
end
|
||||
table.insert(t1, v)
|
||||
end
|
||||
@@ -379,78 +219,132 @@ function Builder:_format_line(indent_markers, arrows, icon, name, git_icons, dia
|
||||
|
||||
local line = { indent_markers, arrows }
|
||||
add_to_end(line, { icon })
|
||||
if git_icons and self.git_placement == "before" then
|
||||
add_to_end(line, git_icons)
|
||||
end
|
||||
if modified_icon and self.modified_placement == "before" then
|
||||
add_to_end(line, { modified_icon })
|
||||
end
|
||||
if diagnostics_icon and self.diagnostics_placement == "before" then
|
||||
add_to_end(line, { diagnostics_icon })
|
||||
end
|
||||
if bookmark_icon and self.bookmarks_placement == "before" then
|
||||
add_to_end(line, { bookmark_icon })
|
||||
|
||||
for i = #M.decorators, 1, -1 do
|
||||
add_to_end(line, M.decorators[i]:icons_before(node))
|
||||
end
|
||||
|
||||
add_to_end(line, { name })
|
||||
|
||||
if git_icons and self.git_placement == "after" then
|
||||
add_to_end(line, git_icons)
|
||||
end
|
||||
if modified_icon and self.modified_placement == "after" then
|
||||
add_to_end(line, { modified_icon })
|
||||
end
|
||||
if diagnostics_icon and self.diagnostics_placement == "after" then
|
||||
add_to_end(line, { diagnostics_icon })
|
||||
end
|
||||
if bookmark_icon and self.bookmarks_placement == "after" then
|
||||
add_to_end(line, { bookmark_icon })
|
||||
for i = #M.decorators, 1, -1 do
|
||||
add_to_end(line, M.decorators[i]:icons_after(node))
|
||||
end
|
||||
|
||||
log.line("dev", "line = %s", vim.inspect(line))
|
||||
return line
|
||||
end
|
||||
|
||||
function Builder:_build_line(node, idx, num_children, unloaded_bufnr)
|
||||
local copy_paste = require "nvim-tree.actions.fs.copy-paste"
|
||||
---@private
|
||||
---@param node Node
|
||||
function Builder:build_signs(node)
|
||||
-- first in priority order
|
||||
local sign_name
|
||||
for _, d in ipairs(M.decorators) do
|
||||
sign_name = d:sign_name(node)
|
||||
if sign_name then
|
||||
self.signs[self.index] = sign_name
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
---Combined group name less than the 200 byte limit of highlight group names
|
||||
---@private
|
||||
---@param groups string[] highlight group names
|
||||
---@return string name "NvimTreeCombinedHL" .. sha256
|
||||
function Builder:combined_group_name(groups)
|
||||
return string.format("NvimTreeCombinedHL%s", vim.fn.sha256(table.concat(groups)))
|
||||
end
|
||||
|
||||
---Create a highlight group for groups with later groups overriding previous.
|
||||
---@private
|
||||
---@param groups string[] highlight group names
|
||||
function Builder:create_combined_group(groups)
|
||||
local combined_name = self:combined_group_name(groups)
|
||||
|
||||
-- only create if necessary
|
||||
if not vim.tbl_contains(self.combined_groups, combined_name) then
|
||||
local combined_hl = {}
|
||||
|
||||
-- build the highlight, overriding values
|
||||
for _, group in ipairs(groups) do
|
||||
local hl = vim.api.nvim_get_hl(0, { name = group, link = false })
|
||||
combined_hl = vim.tbl_extend("force", combined_hl, hl)
|
||||
end
|
||||
|
||||
-- highlight directly in the namespace
|
||||
vim.api.nvim_set_hl(appearance.NS_ID, combined_name, combined_hl)
|
||||
|
||||
table.insert(self.combined_groups, combined_name)
|
||||
end
|
||||
end
|
||||
|
||||
---Calculate highlight group for icon and name. A combined highlight group will be created
|
||||
---when there is more than one highlight.
|
||||
---A highlight group is always calculated and upserted for the case of highlights changing.
|
||||
---@private
|
||||
---@param node Node
|
||||
---@return string|nil icon_hl_group
|
||||
---@return string|nil name_hl_group
|
||||
function Builder:add_highlights(node)
|
||||
-- result
|
||||
local icon_hl_group, name_hl_group
|
||||
|
||||
-- calculate all groups
|
||||
local icon_groups = {}
|
||||
local name_groups = {}
|
||||
local d, icon, name
|
||||
for i = #M.decorators, 1, -1 do
|
||||
d = M.decorators[i]
|
||||
icon, name = d:groups_icon_name(node)
|
||||
table.insert(icon_groups, icon)
|
||||
table.insert(name_groups, name)
|
||||
end
|
||||
|
||||
-- one or many icon groups
|
||||
if #icon_groups > 1 then
|
||||
icon_hl_group = self:combined_group_name(icon_groups)
|
||||
self:create_combined_group(icon_groups)
|
||||
else
|
||||
icon_hl_group = icon_groups[1]
|
||||
end
|
||||
|
||||
-- one or many name groups
|
||||
if #name_groups > 1 then
|
||||
name_hl_group = self:combined_group_name(name_groups)
|
||||
self:create_combined_group(name_groups)
|
||||
else
|
||||
name_hl_group = name_groups[1]
|
||||
end
|
||||
|
||||
return icon_hl_group, name_hl_group
|
||||
end
|
||||
|
||||
---@private
|
||||
function Builder:build_line(node, idx, num_children)
|
||||
-- various components
|
||||
local indent_markers = pad.get_indent_markers(self.depth, idx, num_children, node, self.markers)
|
||||
local arrows = pad.get_arrows(node)
|
||||
|
||||
-- adds icons to signcolumn
|
||||
local bookmark_icon = self:_get_bookmark_icon(node)
|
||||
local git_icons = self:_get_git_icons(node)
|
||||
local modified_icon = self:_get_modified_icon(node)
|
||||
local diagnostics_icon = self:_get_diagnostics_icon(node)
|
||||
|
||||
-- main components
|
||||
local is_folder = node.nodes ~= nil
|
||||
local is_symlink = node.link_to ~= nil
|
||||
local icon, name
|
||||
if is_folder then
|
||||
icon, name = self:_build_folder(node)
|
||||
icon, name = self:build_folder(node)
|
||||
elseif is_symlink then
|
||||
icon, name = self:_build_symlink(node)
|
||||
icon, name = self:build_symlink(node)
|
||||
else
|
||||
icon, name = self:_build_file(node)
|
||||
icon, name = self:build_file(node)
|
||||
end
|
||||
|
||||
-- highlight override
|
||||
local icon_hl_override, name_hl_override = self:_get_highlight_override(node, unloaded_bufnr)
|
||||
if icon_hl_override then
|
||||
icon.hl = { icon_hl_override }
|
||||
end
|
||||
if name_hl_override then
|
||||
name.hl = { name_hl_override }
|
||||
end
|
||||
-- highighting
|
||||
local icon_hl_group, name_hl_group = self:add_highlights(node)
|
||||
table.insert(icon.hl, icon_hl_group)
|
||||
table.insert(name.hl, name_hl_group)
|
||||
|
||||
-- extra highighting
|
||||
self:_append_highlight(node, bookmarks.get_highlight, icon.hl, name.hl)
|
||||
self:_append_highlight(node, diagnostics.get_highlight, icon.hl, name.hl)
|
||||
self:_append_highlight(node, copy_paste.get_highlight, icon.hl, name.hl)
|
||||
|
||||
local line = self:_format_line(indent_markers, arrows, icon, name, git_icons, diagnostics_icon, modified_icon, bookmark_icon)
|
||||
self:_insert_line(self:_unwrap_highlighted_strings(line))
|
||||
local line = self:format_line(indent_markers, arrows, icon, name, node)
|
||||
table.insert(self.lines, self:unwrap_highlighted_strings(line))
|
||||
|
||||
self.index = self.index + 1
|
||||
|
||||
@@ -458,13 +352,14 @@ function Builder:_build_line(node, idx, num_children, unloaded_bufnr)
|
||||
|
||||
if node.open then
|
||||
self.depth = self.depth + 1
|
||||
self:build(node, unloaded_bufnr)
|
||||
self:build_lines(node)
|
||||
self.depth = self.depth - 1
|
||||
end
|
||||
end
|
||||
|
||||
function Builder:_get_nodes_number(nodes)
|
||||
if not self.filter then
|
||||
---@private
|
||||
function Builder:get_nodes_number(nodes)
|
||||
if not live_filter.filter then
|
||||
return #nodes
|
||||
end
|
||||
|
||||
@@ -477,53 +372,77 @@ function Builder:_get_nodes_number(nodes)
|
||||
return i
|
||||
end
|
||||
|
||||
function Builder:build(tree, unloaded_bufnr)
|
||||
local num_children = self:_get_nodes_number(tree.nodes)
|
||||
---@private
|
||||
function Builder:build_lines(node)
|
||||
if not node then
|
||||
node = core.get_explorer()
|
||||
end
|
||||
local num_children = self:get_nodes_number(node.nodes)
|
||||
local idx = 1
|
||||
for _, node in ipairs(tree.nodes) do
|
||||
if not node.hidden then
|
||||
self:_build_line(node, idx, num_children, unloaded_bufnr)
|
||||
for _, n in ipairs(node.nodes) do
|
||||
if not n.hidden then
|
||||
self:build_signs(n)
|
||||
self:build_line(n, idx, num_children)
|
||||
idx = idx + 1
|
||||
end
|
||||
end
|
||||
|
||||
return self
|
||||
end
|
||||
|
||||
local function format_root_name(root_cwd, root_label)
|
||||
---@private
|
||||
---@param root_label function|string
|
||||
---@return string
|
||||
function Builder:format_root_name(root_label)
|
||||
if type(root_label) == "function" then
|
||||
local label = root_label(root_cwd)
|
||||
local label = root_label(self.root_cwd)
|
||||
if type(label) == "string" then
|
||||
return label
|
||||
else
|
||||
root_label = DEFAULT_ROOT_FOLDER_LABEL
|
||||
return "???"
|
||||
end
|
||||
end
|
||||
return utils.path_remove_trailing(vim.fn.fnamemodify(root_cwd, root_label))
|
||||
return utils.path_remove_trailing(vim.fn.fnamemodify(self.root_cwd, root_label))
|
||||
end
|
||||
|
||||
function Builder:build_header(show_header)
|
||||
if show_header then
|
||||
local root_name = format_root_name(self.root_cwd, self.root_folder_label)
|
||||
self:_insert_line(root_name)
|
||||
self:_insert_highlight({ "NvimTreeRootFolder" }, 0, string.len(root_name))
|
||||
---@private
|
||||
function Builder:build_header()
|
||||
if view.is_root_folder_visible(core.get_cwd()) then
|
||||
local root_name = self:format_root_name(M.opts.renderer.root_folder_label)
|
||||
table.insert(self.lines, root_name)
|
||||
self:insert_highlight({ "NvimTreeRootFolder" }, 0, string.len(root_name))
|
||||
self.index = 1
|
||||
end
|
||||
|
||||
if self.filter then
|
||||
local filter_line = self.filter_prefix .. "/" .. self.filter .. "/"
|
||||
self:_insert_line(filter_line)
|
||||
local prefix_length = string.len(self.filter_prefix)
|
||||
self:_insert_highlight({ "NvimTreeLiveFilterPrefix" }, 0, prefix_length)
|
||||
self:_insert_highlight({ "NvimTreeLiveFilterValue" }, prefix_length, string.len(filter_line))
|
||||
if live_filter.filter then
|
||||
local filter_line = string.format("%s/%s/", M.opts.live_filter.prefix, live_filter.filter)
|
||||
table.insert(self.lines, filter_line)
|
||||
local prefix_length = string.len(M.opts.live_filter.prefix)
|
||||
self:insert_highlight({ "NvimTreeLiveFilterPrefix" }, 0, prefix_length)
|
||||
self:insert_highlight({ "NvimTreeLiveFilterValue" }, prefix_length, string.len(filter_line))
|
||||
self.index = self.index + 1
|
||||
end
|
||||
end
|
||||
|
||||
---Build all lines with highlights and signs
|
||||
---@return Builder
|
||||
function Builder:build()
|
||||
self:build_header()
|
||||
self:build_lines()
|
||||
return self
|
||||
end
|
||||
|
||||
function Builder:unwrap()
|
||||
return self.lines, self.highlights, self.signs
|
||||
function Builder.setup(opts)
|
||||
M.opts = opts
|
||||
|
||||
-- priority order
|
||||
M.decorators = {
|
||||
DecoratorCut:new(opts),
|
||||
DecoratorCopied:new(opts),
|
||||
DecoratorDiagnostics:new(opts),
|
||||
DecoratorBookmarks:new(opts),
|
||||
DecoratorModified:new(opts),
|
||||
DecoratorOpened:new(opts),
|
||||
DecoratorGit:new(opts),
|
||||
}
|
||||
end
|
||||
|
||||
return Builder
|
||||
|
||||
Reference in New Issue
Block a user