fix(highlight): respect user bold configuration (fixes #448) (#450)

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>
This commit is contained in:
Aaron Pham
2024-09-01 19:33:04 -04:00
committed by GitHub
parent c33ab80d88
commit 96d060db83
2 changed files with 25 additions and 21 deletions

View File

@@ -135,7 +135,7 @@ M.defaults = {
},
},
windows = {
---@type "right" | "left" | "top" | "bottom"
---@alias AvantePosition "right" | "left" | "top" | "bottom"
position = "right",
wrap = true, -- similar to vim.o.wrap
width = 30, -- default % based on available width in vertical layout
@@ -171,12 +171,10 @@ M.options = {}
---@field highlights AvanteConflictHighlights
M.diff = {}
---@class AvanteHintsConfig
---@field enabled boolean
M.hints = {}
---@param opts? avante.Config
function M.setup(opts)
vim.validate({ opts = { opts, "table", true } })
M.options = vim.tbl_deep_extend(
"force",
M.defaults,
@@ -184,7 +182,7 @@ function M.setup(opts)
---@type avante.Config
{
behaviour = {
support_paste_from_clipboard = M.support_paste_image(),
support_paste_from_clipboard = M.support_paste_image(true),
},
}
)
@@ -193,25 +191,28 @@ function M.setup(opts)
M.options.silent_warning = not M.options.debug
end
vim.validate({ provider = { M.options.provider, "string", false } })
M.diff = vim.tbl_deep_extend(
"force",
{},
M.options.diff,
{ mappings = M.options.mappings.diff, highlights = M.options.highlights.diff }
)
M.hints = vim.tbl_deep_extend("force", {}, M.options.hints)
if next(M.options.vendors) ~= nil then
for k, v in pairs(M.options.vendors) do
M.options.vendors[k] = type(v) == "function" and v() or v
end
vim.validate({ vendors = { M.options.vendors, "table", true } })
end
end
---@param opts? avante.Config
function M.override(opts)
opts = opts or {}
M.options = vim.tbl_deep_extend("force", M.options, opts)
vim.validate({ opts = { opts, "table", true } })
M.options = vim.tbl_deep_extend("force", M.options, opts or {})
if not M.options.silent_warning then
-- set silent_warning to true if debug is false
M.options.silent_warning = not M.options.debug
@@ -223,12 +224,12 @@ function M.override(opts)
M.options.diff,
{ mappings = M.options.mappings.diff, highlights = M.options.highlights.diff }
)
M.hints = vim.tbl_deep_extend("force", {}, M.options.hints)
if next(M.options.vendors) ~= nil then
for k, v in pairs(M.options.vendors) do
M.options.vendors[k] = type(v) == "function" and v() or v
end
vim.validate({ vendors = { M.options.vendors, "table", true } })
end
end