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

refactor: Improve section separators 

- behaviour change now statusline won't be separated with %=
  if you don't have at lest one of lualine_x/y/z
- fixed some bugs
- simplified the transitional separators quite a bit. I think now
  it's understandable . Yay .
- Perf improvements too.
This commit is contained in:
shadmansaleh 2021-08-25 17:43:12 +06:00 committed by Shadman
parent fa1f001207
commit 1c57497863
3 changed files with 84 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
lua/lualine/highlight.lua
View File

@ -225,58 +225,24 @@ function M.format_highlight(is_focused, highlight_group)
end end
-- @description : Provides transitional highlights for section separators. -- @description : Provides transitional highlights for section separators.
-- @param left_section_data :(string) section before separator -- @param left_hl :(string) this highlights bg is used for fg of transitional hl
-- @param right_section_data:(string) section after separator -- @param right_hl:(string) this highlights bg is used for bg of transitional hl
-- @param reverse :(string) Whether it's a left separator or right separator -- '▶️' and '◀️' ' eeds reverse colors so the caller should swap left and right
-- '▶️' and '◀️' needs reverse colors so this parameter needs to be set true.
-- @return: (string) formated highlight group name -- @return: (string) formated highlight group name
function M.get_transitional_highlights(left_section_data, right_section_data, function M.get_transitional_highlights(left_hl, right_hl)
reverse) -- When both left and right highlights are same or one is absent
local left_highlight_name, right_highlight_name -- nothing to transition to.
-- Grab the last highlighter of left section if left_hl == nil or right_hl == nil or left_hl == right_hl then return nil end
if left_section_data then
-- extract highlight_name from .....%#highlight_name#
left_highlight_name = left_section_data:match('.*%%#(.-)#.-')
else
-- When right section us unavailable default to lualine_c
left_highlight_name = append_mode('lualine_c')
if not utils.highlight_exists(left_highlight_name) then
left_highlight_name = 'lualine_c_normal'
end
end
if right_section_data then
-- extract highlight_name from %#highlight_name#....
right_highlight_name = right_section_data:match('.-%%#(.-)#.*')
else
-- When right section us unavailable default to lualine_c
right_highlight_name = append_mode('lualine_c')
if not utils.highlight_exists(right_highlight_name) then
right_highlight_name = 'lualine_c_normal'
end
end
-- When both left and right highlights are same nothing to transition to
if left_highlight_name == right_highlight_name then return end
-- construct the name of hightlight group -- construct the name of hightlight group
local highlight_name local highlight_name = table.concat({'lualine_transitional',left_hl,'to',right_hl}, '_')
if left_highlight_name:find('lualine_') == 1 then
highlight_name = left_highlight_name .. '_to_' .. right_highlight_name
else
highlight_name = 'lualine_' .. left_highlight_name .. '_to_' ..
right_highlight_name
end
if not utils.highlight_exists(highlight_name) then if not utils.highlight_exists(highlight_name) then
-- Create the highlight_group if needed -- Create the highlight_group if needed
-- Get colors from highlights -- Get colors from highlights
-- using string.format to convert decimal to hexadecimal local fg = utils.extract_highlight_colors(left_hl, 'bg')
local fg = utils.extract_highlight_colors(left_highlight_name, 'bg') local bg = utils.extract_highlight_colors(right_hl, 'bg')
local bg = utils.extract_highlight_colors(right_highlight_name, 'bg') if not fg or not bg then return nil end -- Color retrieval failed
-- swap the bg and fg when reverse is true. As in that case highlight will if bg == fg then return nil end -- Separator won't be visible anyway
-- be placed before section
if reverse then fg, bg = bg, fg end
if not fg or not bg then return '' end -- Color retrieval failed
if bg == fg then return '' end -- Separatoe won't be visible anyway
M.highlight(highlight_name, fg, bg, nil) M.highlight(highlight_name, fg, bg, nil)
end end
return '%#' .. highlight_name .. '#' return '%#' .. highlight_name .. '#'

165
lua/lualine/init.lua
View File

@ -11,86 +11,79 @@ local modules = require('lualine.utils.lazy_require'){
local config -- Stores cureently applied config local config -- Stores cureently applied config
local new_config = true -- Stores config that will be applied local new_config = true -- Stores config that will be applied
local function apply_transitional_separators(previous_section, current_section, local function apply_transitional_separators(status)
next_section) local status_applied = {} -- Collects all the pieces for concatation
local last_hl -- Stores lash highligjt group that we found
local copied_pos = 1 -- Tracks how much we've copied over to status_applied
local str_checked = 1 -- Tracks where the searcher head is at
local function fill_section_separator(prev, next, sep, reverse) local function find_next_hl()
if #sep == 0 then return 0 end -- Gets the next valid hl group from str_checked
local transitional_highlight = modules.highlight.get_transitional_highlights(prev, local hl_pos_start, hl_pos_end = status:find('%%#.-#', str_checked + 1)
next, while true do
reverse) if not hl_pos_start then return nil end
if transitional_highlight and #transitional_highlight > 0 then -- When there are more that one hl group next to one another like
return transitional_highlight .. sep -- %#HL1#%#HL2#%#HL3# we need to return HL3. This makes that happen.
else local next_start, next_end = status:find('^%%#.-#', hl_pos_end + 1)
return '' if next_start == nil then break end
hl_pos_start, hl_pos_end = next_start, next_end
end
return status:sub(hl_pos_start + 2, hl_pos_end - 1)
end
local function fill_section_separator(sep, reverse)
-- Inserts transitional separator along with transitional highlight
if last_hl and #last_hl == 0 then return end
local next_hl = find_next_hl()
if next_hl == nil then return end
local transitional_highlight = reverse -- lua ternary assignment x ? y : z
and modules.highlight.get_transitional_highlights(last_hl, next_hl)
or modules.highlight.get_transitional_highlights(next_hl, last_hl)
if transitional_highlight then
table.insert(status_applied, transitional_highlight .. sep)
end end
end end
-- variable to track separators position -- Process entire status replace the %s{sep} & %S{sep} placeholders
local sep_pos = 1 -- with proper transitional separator.
while str_checked ~= nil do
-- %s{sep} is marker for left separator and str_checked = status:find('%%', str_checked)
-- %S{sep} is marker for right separator if str_checked == nil then break end
-- Apply left separator table.insert(status_applied, status:sub(copied_pos, str_checked - 1))
while sep_pos do -- -1 so we don't copy '%'
-- get what the separator char copied_pos = str_checked
local sep = current_section.data:match('%%s{(.-)}', sep_pos) local next_char = modules.utils.charAt(status, str_checked +1)
-- Get where separator starts from if next_char == '#' then
sep_pos = current_section.data:find('%%s{.-}', sep_pos) -- %#hl_name# highlights
if not sep or not sep_pos then break end last_hl = status:match('^%%#(.-)#', str_checked)
-- part of section before separator . -1 since we don't want the % str_checked = str_checked + #last_hl + 3
local prev = current_section.data:sub(1, sep_pos - 1) elseif next_char == 's' then
-- part of section after separator. 4 is length of "%s{}" -- %s{sep} is marker for left separator and
local nxt = current_section.data:sub(sep_pos + 4 + #sep) local sep = status:match('^%%s{(.-)}', str_checked)
-- prev might not exist when separator is the first element of section str_checked = str_checked + #sep + 4 -- 4 = len(%{})
-- use previous section as prev fill_section_separator(sep, false)
if not prev or #prev == 0 or sep_pos == 1 then copied_pos = str_checked
prev = previous_section.data elseif next_char == 'S' then
end -- %S{sep} is marker for right separator and
if prev ~= previous_section.data then local sep = status:match('^%%S{(.-)}', str_checked)
-- Since the section isn't suppose to be highlighted with separators str_checked = str_checked + #sep + 4 -- 4 = len(%{})
-- separators highlight extract the last highlight and place it between fill_section_separator(sep, true)
-- separator and section copied_pos = str_checked
local last_hl = prev:match('.*(%%#.-#).-') elseif next_char == '%' then
current_section.data = prev .. str_checked = str_checked + 2 -- Skip the following % too
fill_section_separator(prev, nxt, sep, false) ..
last_hl .. nxt
else else
current_section.data = fill_section_separator(prev, nxt, sep, true) .. nxt str_checked = str_checked + 1 -- Push it forward to avoid inf loop
end end
end end
table.insert(status_applied, status:sub(copied_pos)) -- Final chunk
-- Reset pos for right separator return table.concat(status_applied)
sep_pos = 1
-- Apply right separator
while sep_pos do
local sep = current_section.data:match('%%S{(.-)}', sep_pos)
sep_pos = current_section.data:find('%%S{.-}', sep_pos)
if not sep or not sep_pos then break end
local prev = current_section.data:sub(1, sep_pos - 1)
local nxt = current_section.data:sub(sep_pos + 4 + #sep)
if not nxt or #nxt == 0 or sep_pos == #current_section.data then
nxt = next_section.data
end
if nxt ~= next_section.data then
current_section.data = prev ..
fill_section_separator(prev, nxt, sep, false) ..
nxt
else
current_section.data = prev ..
fill_section_separator(prev, nxt, sep, false)
end
sep_pos = sep_pos + 4 + #sep
end
return current_section.data
end end
local function statusline(sections, is_focused) local function statusline(sections, is_focused)
-- The sequence sections should maintain [SECTION_SEQUENCE]
-- status_builder stores statusline without section_separators
-- The sequence sections should maintain
local section_sequence = {'a', 'b', 'c', 'x', 'y', 'z'} local section_sequence = {'a', 'b', 'c', 'x', 'y', 'z'}
local status_builder = {} local status = {}
local applied_midsection_devider = false
for _, section_name in ipairs(section_sequence) do for _, section_name in ipairs(section_sequence) do
if sections['lualine_' .. section_name] then if sections['lualine_' .. section_name] then
-- insert highlight+components of this section to status_builder -- insert highlight+components of this section to status_builder
@ -98,38 +91,16 @@ local function statusline(sections, is_focused)
sections['lualine_' .. section_name], sections['lualine_' .. section_name],
section_name, is_focused) section_name, is_focused)
if #section_data > 0 then if #section_data > 0 then
table.insert(status_builder, {name = section_name, data = section_data}) if not applied_midsection_devider and section_name > 'c' then
applied_midsection_devider = true
section_data = '%='..section_data
end
table.insert(status, section_data)
end end
end end
end end
-- Actual statusline return apply_transitional_separators(table.concat(status))
local status = {}
local half_passed = false
for i = 1, #status_builder do
-- midsection divider
if not half_passed and status_builder[i].name > 'c' then
table.insert(status,
modules.highlight.format_highlight(is_focused, 'lualine_c') .. '%=')
half_passed = true
end
-- component separator needs to have fg = current_section.bg
-- and bg = adjacent_section.bg
local previous_section = status_builder[i - 1] or {}
local current_section = status_builder[i]
local next_section = status_builder[i + 1] or {}
local section = apply_transitional_separators(previous_section,
current_section, next_section)
table.insert(status, section)
end
-- incase none of x,y,z was configured lets not fill whole statusline with a,b,c section
if not half_passed then
table.insert(status,
modules.highlight.format_highlight(is_focused, 'lualine_c') .. '%=')
end
return table.concat(status)
end end
-- check if any extension matches the filetype and return proper sections -- check if any extension matches the filetype and return proper sections

4
lua/lualine/utils/utils.lua
View File

@ -80,4 +80,8 @@ function M.is_valid_filename(name)
return name:find(invalid_chars) == nil return name:find(invalid_chars) == nil
end end
function M.charAt(str, pos)
return string.char(str:byte(pos))
end
return M return M