CarGDev/avante.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: make sure to get the final highlight values rather than link names (#1682)

Browse Source 
* fix: make sure to get the final highlight values rather than link names

* fix: update other `nvim_get_hl` calls to use `link = false`

* fix: more link = false

---------

Co-authored-by: yetone <yetoneful@gmail.com>
This commit is contained in:
Micah Halter
2025-03-24 03:42:44 -04:00
committed by GitHub
parent 2c63dfea16
commit 46be28c357
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lua/avante/highlights.lua
View File

@@ -53,7 +53,7 @@ local H = {}
local M = {} local M = {}
local function has_set_colors(hl_group) local function has_set_colors(hl_group)
local hl = api.nvim_get_hl(0, { name = hl_group }) local hl = api.nvim_get_hl(0, { name = hl_group, link = false })
return next(hl) ~= nil return next(hl) ~= nil
end end
@@ -69,10 +69,10 @@ function M.setup()
if not has_set_colors(hl.name) then if not has_set_colors(hl.name) then
local bg = hl.bg local bg = hl.bg
local fg = hl.fg local fg = hl.fg
if hl.bg_link ~= nil then bg = api.nvim_get_hl(0, { name = hl.bg_link }).bg end if hl.bg_link ~= nil then bg = api.nvim_get_hl(0, { name = hl.bg_link, link = false }).bg end
if hl.fg_link ~= nil then fg = api.nvim_get_hl(0, { name = hl.fg_link }).fg end if hl.fg_link ~= nil then fg = api.nvim_get_hl(0, { name = hl.fg_link, link = false }).fg end
if hl.bg_link_fg ~= nil then bg = api.nvim_get_hl(0, { name = hl.bg_link_fg }).fg end if hl.bg_link_fg ~= nil then bg = api.nvim_get_hl(0, { name = hl.bg_link_fg, link = false }).fg end
if hl.fg_link_bg ~= nil then fg = api.nvim_get_hl(0, { name = hl.fg_link_bg }).bg end if hl.fg_link_bg ~= nil then fg = api.nvim_get_hl(0, { name = hl.fg_link_bg, link = false }).bg end
api.nvim_set_hl( api.nvim_set_hl(
0, 0,
hl.name, hl.name,
@@ -90,12 +90,12 @@ function M.setup_conflict_highlights()
---@return number | nil ---@return number | nil
local function get_bg(hl_name) local function get_bg(hl_name)
local hl = api.nvim_get_hl(0, { name = hl_name }) local hl = api.nvim_get_hl(0, { name = hl_name, link = false })
return hl.bg return hl.bg
end end
local function get_bold(hl_name) local function get_bold(hl_name)
local hl = api.nvim_get_hl(0, { name = hl_name }) local hl = api.nvim_get_hl(0, { name = hl_name, link = false })
return hl.bold return hl.bold
end end

2
lua/avante/utils/init.lua
View File

@@ -311,7 +311,7 @@ end
---@return table<string, string> ---@return table<string, string>
function M.get_hl(name) function M.get_hl(name)
if not name then return {} end if not name then return {} end
return api.nvim_get_hl(0, { name = name }) return api.nvim_get_hl(0, { name = name, link = false })
end end
--- vendor from lazy.nvim for early access and override --- vendor from lazy.nvim for early access and override