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

Fix #125 (diff highlight affecting other component) (#128)

This commit is contained in:
Shadman 2021-03-14 19:38:19 +06:00 committed by GitHub
parent 332f488e24
commit 2c2b8b0906
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lua/lualine/utils/component.lua
View File

@ -37,11 +37,11 @@ local function apply_padding(status, options)
end end
-- Applies custom highlights for component -- Applies custom highlights for component
local function apply_highlights(status, options) local function apply_highlights(status, options, default_hl)
if options.color_highlight then if options.color_highlight then
status = highlight.component_format_highlight(options.color_highlight) .. status status = highlight.component_format_highlight(options.color_highlight) .. status
end end
return status return status .. default_hl
end end
-- Apply icon in front of component -- Apply icon in front of component
@ -54,24 +54,16 @@ end
-- Apply separator at end of component only when -- Apply separator at end of component only when
-- custom highlights haven't affected background -- custom highlights haven't affected background
local function apply_spearator(status, options, highlight_name) local function apply_spearator(status, options)
local separator local separator
if options.separator and #options.separator > 0 then if options.separator and #options.separator > 0 then
separator = options.separator separator = options.separator
elseif options.component_separators then elseif options.component_separators then
if options.self.section < 'lualine_x' then separator = options.component_separators[1] if options.self.section < 'lualine_x' then separator = options.component_separators[1]
else separator = options.component_separators[2] end else separator = options.component_separators[2] end
if not separator then
options.separator_applied = nil
return status
end
options.separator = separator options.separator = separator
else
options.separator_applied = nil
return status
end end
separator = highlight_name .. separator if separator then status = status .. separator end
status = status .. separator
options.separator_applied = separator options.separator_applied = separator
return status return status
end end
@ -97,8 +89,8 @@ function M.draw_section(section, highlight_name)
localstatus = apply_icon(localstatus, component) localstatus = apply_icon(localstatus, component)
localstatus = apply_case(localstatus, component) localstatus = apply_case(localstatus, component)
localstatus = apply_padding(localstatus, component) localstatus = apply_padding(localstatus, component)
localstatus = apply_highlights(localstatus, component) localstatus = apply_highlights(localstatus, component, highlight_name)
localstatus = apply_spearator(localstatus, component, highlight_name) localstatus = apply_spearator(localstatus, component)
if custom_highlight_at_begining or if custom_highlight_at_begining or
(#drawn_components > 0 and not drawn_components[#drawn_components].separator_applied)then (#drawn_components > 0 and not drawn_components[#drawn_components].separator_applied)then
-- Don't prepend with old highlight when the component changes it imidiately -- Don't prepend with old highlight when the component changes it imidiately