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.

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(highlights): avoid NONE backgrounds for custom groups #50

Merged
merged 1 commit into from
Jul 31, 2024
Merged
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion lua/mellifluous/highlights/custom_groups.lua
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
local M = {}

local function fallback_if_none(color, fallback_color)
if type(color) == "string" and color == "NONE" then
return fallback_color
end
return color
end

-- Any shared highlight groups that cannot be found in general highlights or
-- treesitter highlights are created here.

function M.get(colors)
local config = require("mellifluous.config").config
local shader = require("mellifluous.utils.shader")
Expand All @@ -11,9 +17,11 @@ function M.get(colors)
MainKeyword = { fg = colors.main_keywords, style = config.styles.keywords },

IndentLine = function(bg)
bg = fallback_if_none(bg, colors.bg)
return { fg = shader.replicate_shade(colors.bg, colors.fg5, bg) }
end,
IndentLineInactive = function(bg)
bg = fallback_if_none(bg, colors.bg)
return {
fg = config.is_bg_dark and shader.replicate_shade(colors.bg, colors.bg4, bg)
or shader.replicate_shade(colors.bg, colors.dark_bg2, bg),
Expand All @@ -22,6 +30,7 @@ function M.get(colors)

MenuButton = { fg = colors.ui_blue },
MenuButtonSelected = function(bg)
bg = fallback_if_none(bg, colors.bg)
local applied_bg = config.is_bg_dark and shader.replicate_shade(colors.bg, colors.bg4, bg)
or shader.replicate_shade(colors.bg, colors.dark_bg2, bg)
return {
Expand Down
Loading