Skip to content
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

fix(statusline): set hl_group for statusline separators #616

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −23
Open

fix(statusline): set hl_group for statusline separators #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions lua/trouble/api.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,7 @@ function M.statusline(opts)
end
renderer:clear()
renderer:sections({ section })
status = renderer:statusline()
if opts.hl_group then
status = require("trouble.config.highlights").fix_statusline(status, opts.hl_group)
end
status = renderer:statusline({ hl_group = opts.hl_group })
return status
end,
}
Expand Down
31 changes: 16 additions & 15 deletions lua/trouble/config/highlights.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,21 +93,22 @@ function M.source(source, links)
end

M._fixed = {} ---@type table<string, string>
---@param sl string
function M.fix_statusline(sl, statusline_hl)
local bg = vim.api.nvim_get_hl(0, { name = statusline_hl, link = false })
bg = bg and bg.bg or nil

return sl:gsub("%%#(.-)#", function(hl)
if not M._fixed[hl] then
local opts = vim.api.nvim_get_hl(0, { name = hl, link = false }) or {}
opts.bg = bg
local group = "TroubleStatusline" .. vim.tbl_count(M._fixed)
vim.api.nvim_set_hl(0, group, opts)
M._fixed[hl] = group
end
return "%#" .. M._fixed[hl] .. "#"
end)
---@param hl string
---@param statusline_hl string?
function M.fix_statusline_bg(hl, statusline_hl)
if not statusline_hl then
return hl
end
local key = hl .. "_" .. statusline_hl
if not M._fixed[key] then
local opts = vim.api.nvim_get_hl(0, { name = hl, link = false }) or {}
local statusline_opts = vim.api.nvim_get_hl(0, { name = statusline_hl, link = false })
opts.bg = statusline_opts and statusline_opts.bg or nil
local group = "TroubleStatusline" .. vim.tbl_count(M._fixed)
vim.api.nvim_set_hl(0, group, opts)
M._fixed[key] = group
end
return M._fixed[key]
end

return M
16 changes: 12 additions & 4 deletions lua/trouble/view/text.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,20 +104,28 @@ function M:nl()
return self
end

---@param opts? {sep?:string}
---@param opts? {sep?:string,hl_group?:string}
function M:statusline(opts)
local sep = opts and opts.sep or " "
local hl_group = opts and opts.hl_group or nil
if hl_group then
sep = ("%%#%s#%s%%*"):format(hl_group, sep)
end
local lines = {} ---@type string[]
for _, line in ipairs(self._lines) do
local parts = {}
for _, segment in ipairs(line) do
local str = segment.str:gsub("%%", "%%%%")
if segment.hl then
str = ("%%#%s#%s%%*"):format(segment.hl, str)
local fix_statusline_bg = require("trouble.config.highlights").fix_statusline_bg
local hl = segment.hl and fix_statusline_bg(segment.hl, hl_group) or hl_group
if hl then
str = ("%%#%s#%s%%*"):format(hl, str)
end
parts[#parts + 1] = str
end
table.insert(lines, table.concat(parts, ""))
if #parts ~= 0 then
table.insert(lines, table.concat(parts, ""))
end
end
return table.concat(lines, sep)
end
Expand Down