rob
/
lualine.nvim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13 from shadmansaleh/fix/component_color_on_linked_theme 

fix: component highlight fall backs failing
This commit is contained in:
Shadman 2021-08-20 01:43:34 +06:00 committed by GitHub
parent 284bad71a1 895fda9b91
commit aa65ef46fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lua/lualine/highlight.lua
View File

@ -96,6 +96,29 @@ local function append_mode(highlight_group)
return highlight_group return highlight_group
end end
-- Helper function for create component highlight
-- Handles fall back of colors when crea58ng highlight group
-- @param color table color passed for creating component highlight
-- @param options_color color set by color option for component
-- this is first falk back
-- @param default_color Colors et in theme this is 2nd fall back
-- @param kind (fg/bg))
local function get_default_component_color(color, options_color, default_color, kind)
if color[kind] then return color[kind] end
if options_color then
if type(options_color) == 'table' and options_color[kind] then
return options_color[kind]
elseif type(options_color) == 'string' then
return utils.extract_highlight_colors(options_color, kind)
end
end
if type(default_color) == 'table' then
return default_color[kind]
elseif type(default_color) == 'string' then
return utils.extract_highlight_colors(default_color, kind)
end
end
-- Create highlight group with fg bg and gui from theme -- Create highlight group with fg bg and gui from theme
-- @color has to be { fg = "#rrggbb", bg="#rrggbb" gui = "effect" } -- @color has to be { fg = "#rrggbb", bg="#rrggbb" gui = "effect" }
-- all the color elements are optional if fg or bg is not given options must be provided -- all the color elements are optional if fg or bg is not given options must be provided
@ -143,10 +166,8 @@ function M.create_component_highlight_group(color, highlight_tag, options)
local default_color_table = active_theme[mode] and local default_color_table = active_theme[mode] and
active_theme[mode][section] or active_theme[mode][section] or
active_theme.normal[section] active_theme.normal[section]
local bg = (color.bg or (type(options.color) == 'table' and options.color.bg) local bg = get_default_component_color(color, options.color, default_color_table, 'bg')
or default_color_table.bg) local fg = get_default_component_color(color, options.color, default_color_table, 'fg')
local fg = (color.fg or (type(options.color) == 'table' and options.color.fg)
or default_color_table.fg)
-- Check if it's same as normal mode if it is no need to create aditional highlight -- Check if it's same as normal mode if it is no need to create aditional highlight
if mode ~= 'normal' then if mode ~= 'normal' then
if bg ~= normal_hl.bg or fg ~= normal_hl.fg then if bg ~= normal_hl.bg or fg ~= normal_hl.fg then