* 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>
111 lines
3.2 KiB
Lua
111 lines
3.2 KiB
Lua
local diagnostics = require "nvim-tree.diagnostics"
|
|
|
|
local HL_POSITION = require("nvim-tree.enum").HL_POSITION
|
|
local ICON_PLACEMENT = require("nvim-tree.enum").ICON_PLACEMENT
|
|
|
|
local Decorator = require "nvim-tree.renderer.decorator"
|
|
|
|
-- highlight groups by severity
|
|
local HG_ICON = {
|
|
[vim.diagnostic.severity.ERROR] = "NvimTreeDiagnosticErrorIcon",
|
|
[vim.diagnostic.severity.WARN] = "NvimTreeDiagnosticWarnIcon",
|
|
[vim.diagnostic.severity.INFO] = "NvimTreeDiagnosticInfoIcon",
|
|
[vim.diagnostic.severity.HINT] = "NvimTreeDiagnosticHintIcon",
|
|
}
|
|
local HG_FILE = {
|
|
[vim.diagnostic.severity.ERROR] = "NvimTreeDiagnosticErrorFileHL",
|
|
[vim.diagnostic.severity.WARN] = "NvimTreeDiagnosticWarnFileHL",
|
|
[vim.diagnostic.severity.INFO] = "NvimTreeDiagnosticInfoFileHL",
|
|
[vim.diagnostic.severity.HINT] = "NvimTreeDiagnosticHintFileHL",
|
|
}
|
|
local HG_FOLDER = {
|
|
[vim.diagnostic.severity.ERROR] = "NvimTreeDiagnosticErrorFolderHL",
|
|
[vim.diagnostic.severity.WARN] = "NvimTreeDiagnosticWarnFolderHL",
|
|
[vim.diagnostic.severity.INFO] = "NvimTreeDiagnosticInfoFolderHL",
|
|
[vim.diagnostic.severity.HINT] = "NvimTreeDiagnosticHintFolderHL",
|
|
}
|
|
-- opts.diagnostics.icons.
|
|
local ICON_KEYS = {
|
|
["error"] = vim.diagnostic.severity.ERROR,
|
|
["warning"] = vim.diagnostic.severity.WARN,
|
|
["info"] = vim.diagnostic.severity.INFO,
|
|
["hint"] = vim.diagnostic.severity.HINT,
|
|
}
|
|
|
|
---@class DecoratorDiagnostics: Decorator
|
|
---@field icons HighlightedString[]
|
|
local DecoratorDiagnostics = Decorator:new()
|
|
|
|
---@param opts table
|
|
---@return DecoratorDiagnostics
|
|
function DecoratorDiagnostics:new(opts)
|
|
local o = Decorator.new(self, {
|
|
enabled = opts.diagnostics.enable,
|
|
hl_pos = HL_POSITION[opts.renderer.highlight_diagnostics] or HL_POSITION.none,
|
|
icon_placement = ICON_PLACEMENT[opts.renderer.icons.diagnostics_placement] or ICON_PLACEMENT.none,
|
|
})
|
|
---@cast o DecoratorDiagnostics
|
|
|
|
if not o.enabled then
|
|
return o
|
|
end
|
|
|
|
if opts.renderer.icons.show.diagnostics then
|
|
o.icons = {}
|
|
for name, sev in pairs(ICON_KEYS) do
|
|
o.icons[sev] = {
|
|
str = opts.diagnostics.icons[name],
|
|
hl = { HG_ICON[sev] },
|
|
}
|
|
o:define_sign(o.icons[sev])
|
|
end
|
|
end
|
|
|
|
return o
|
|
end
|
|
|
|
---Diagnostic icon: diagnostics.enable, renderer.icons.show.diagnostics and node has status
|
|
---@param node Node
|
|
---@return HighlightedString[]|nil icons
|
|
function DecoratorDiagnostics:calculate_icons(node)
|
|
if node and self.enabled and self.icons then
|
|
local diag_status = diagnostics.get_diag_status(node)
|
|
local diag_value = diag_status and diag_status.value
|
|
|
|
if diag_value then
|
|
return { self.icons[diag_value] }
|
|
end
|
|
end
|
|
end
|
|
|
|
---Diagnostic highlight: diagnostics.enable, renderer.highlight_diagnostics and node has status
|
|
---@param node Node
|
|
---@return string|nil group
|
|
function DecoratorDiagnostics:calculate_highlight(node)
|
|
if not node or not self.enabled or self.hl_pos == HL_POSITION.none then
|
|
return nil
|
|
end
|
|
|
|
local diag_status = diagnostics.get_diag_status(node)
|
|
local diag_value = diag_status and diag_status.value
|
|
|
|
if not diag_value then
|
|
return nil
|
|
end
|
|
|
|
local group
|
|
if node.nodes then
|
|
group = HG_FOLDER[diag_value]
|
|
else
|
|
group = HG_FILE[diag_value]
|
|
end
|
|
|
|
if group then
|
|
return group
|
|
else
|
|
return nil
|
|
end
|
|
end
|
|
|
|
return DecoratorDiagnostics
|