Skip to content
This repository was archived by the owner on Sep 20, 2023. It is now read-only.

Commit

Permalink
fix error when the active or inactive table is empty
Browse files Browse the repository at this point in the history
  • Loading branch information
@famiu
famiu committed Sep 28, 2021
1 parent 561b6ce commit 1b632c7
Showing 1 changed file with 100 additions and 93 deletions.
193 changes: 100 additions & 93 deletions lua/feline/generator.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,122 +333,129 @@ local function parse_component(component, winid, use_short_provider)
}
end

-- Generate statusline by parsing all components and return a string
function M.generate_statusline(winid)
-- Generate default highlights for the statusline
generate_defhl(winid)

local statusline_str = ''

if components_table and not is_disabled(winid) then
local statusline_type
-- Parse statusline sections and truncate the components when necessary
local function parse_statusline_sections(sections, statusline_type, winid)
-- Parse all components in the sections and also store the indices of every component so
-- both the sections and parsed_sections tables can be accessed later on after components
-- are sorted in order of priority
-- Also calculate statusline length while doing all of that
local parsed_sections = {}
local component_indices = {}
local statusline_length = 0

for i, section in ipairs(sections) do
parsed_sections[i] = {}

for j, component in ipairs(section) do
local ok, result = pcall(parse_component, component, winid)

if not ok then
api.nvim_err_writeln(string.format(
"Feline: error while processing component number %d on section %d "..
"of type '%s': %s",
j, i, statusline_type, result
))

result = { str = '', len = 0 }
end

if winid == api.nvim_get_current_win() and not is_forced_inactive() then
statusline_type='active'
else
statusline_type='inactive'
parsed_sections[i][j] = result
component_indices[#component_indices+1] = {i, j}
statusline_length = statusline_length + result.len
end
end

local sections = components_table[statusline_type]

-- Parse all components in the sections and also store the indices of every component so
-- both the sections and parsed_sections tables can be accessed later on after components
-- are sorted in order of priority
-- Also calculate statusline length while doing all of that
local parsed_sections = {}
local component_indices = {}
local statusline_length = 0

for i, section in ipairs(sections) do
parsed_sections[i] = {}

for j, component in ipairs(section) do
local ok, result = pcall(parse_component, component, winid)

if not ok then
api.nvim_err_writeln(string.format(
"Feline: error while processing component number %d on section %d "..
"of type '%s': %s",
j, i, statusline_type, result
))

result = { str = '', len = 0 }
local win_width = api.nvim_win_get_width(winid)

-- If statusline length is larger than the window width, sort the component indices
-- in ascending order of priority of the components they refer to
-- Then truncate the components one by one using by their short_provider or hiding them
-- entirely until the statusline fits within the window
if statusline_length > win_width then
table.sort(component_indices, function(a, b)
-- Access the original component through the sections table using the indices
local first_component_priority = sections[a[1]][a[2]].priority or 0
local second_component_priority = sections[b[1]][b[2]].priority or 0

return first_component_priority < second_component_priority
end)

for _, indices in ipairs(component_indices) do
-- Access the original and parsed values using the indices
local component = sections[indices[1]][indices[2]]
local parsed_component = parsed_sections[indices[1]][indices[2]]

-- If short_provider exists, use it
if component.short_provider then
-- Get new parsed component value using the short_provider and calculate the
-- length difference between the two values, and if it's greater than 0, use
-- the new value instead of the old one
local parsed_component_new = parse_component(component, winid, true)
local length_difference = parsed_component.len - parsed_component_new.len

if length_difference > 0 then
-- Update statusline length and replace old parsed value with new one
statusline_length = statusline_length - length_difference
parsed_sections[indices[1]][indices[2]] = parsed_component_new
end

parsed_sections[i][j] = result
component_indices[#component_indices+1] = {i, j}
statusline_length = statusline_length + result.len
end
end

local win_width = api.nvim_win_get_width(winid)
if statusline_length <= win_width then break end
end

-- If statusline length is larger than the window width, sort the component indices
-- in ascending order of priority of the components they refer to
-- Then truncate the components one by one using by their short_provider or hiding them
-- entirely until the statusline fits within the window
-- If statusline still doesn't fit, start removing components with truncate_hide
if statusline_length > win_width then
table.sort(component_indices, function(a, b)
-- Access the original component through the sections table using the indices
local first_component_priority = sections[a[1]][a[2]].priority or 0
local second_component_priority = sections[b[1]][b[2]].priority or 0

return first_component_priority < second_component_priority
end)

for _, indices in ipairs(component_indices) do
-- Access the original and parsed values using the indices
local component = sections[indices[1]][indices[2]]
local parsed_component = parsed_sections[indices[1]][indices[2]]

-- If short_provider exists, use it
if component.short_provider then
-- Get new parsed component value using the short_provider and calculate the
-- length difference between the two values, and if it's greater than 0, use
-- the new value instead of the old one
local parsed_component_new = parse_component(component, winid, true)
local length_difference = parsed_component.len - parsed_component_new.len

if length_difference > 0 then
-- Update statusline length and replace old parsed value with new one
statusline_length = statusline_length - length_difference
parsed_sections[indices[1]][indices[2]] = parsed_component_new
end
if sections[indices[1]][indices[2]].truncate_hide then
statusline_length = statusline_length -
parsed_sections[indices[1]][indices[2]].len

parsed_sections[indices[1]][indices[2]] = {str = '', len = 0}
end

if statusline_length <= win_width then break end
end
end
end

-- If statusline still doesn't fit, start removing components with truncate_hide
if statusline_length > win_width then
for _, indices in ipairs(component_indices) do
if sections[indices[1]][indices[2]].truncate_hide then
statusline_length = statusline_length -
parsed_sections[indices[1]][indices[2]].len
-- Concatenate all components in each section to get a string for each section
local section_strs = {}

parsed_sections[indices[1]][indices[2]] = {str = '', len = 0}
end
for i, parsed_section in ipairs(parsed_sections) do
local component_strs = {}

if statusline_length <= win_width then break end
end
end
for j, parsed_component in ipairs(parsed_section) do
component_strs[j] = parsed_component.str
end

-- Concatenate all components in each section to get a string for each section
local section_strs = {}
section_strs[i] = table.concat(component_strs)
end

for i, parsed_section in ipairs(parsed_sections) do
local component_strs = {}
-- Finally, concatenate all sections to get the statusline string
return table.concat(section_strs, '%=')
end

for j, parsed_component in ipairs(parsed_section) do
component_strs[j] = parsed_component.str
end
-- Generate statusline by parsing all components and return a string
function M.generate_statusline(winid)
-- Generate default highlights for the statusline
generate_defhl(winid)

section_strs[i] = table.concat(component_strs)
local statusline_str = ''

if components_table and not is_disabled(winid) then
local statusline_type

if winid == api.nvim_get_current_win() and not is_forced_inactive() then
statusline_type='active'
else
statusline_type='inactive'
end

-- Finally, concatenate all sections to get the statusline string
statusline_str = table.concat(section_strs, '%=')
local sections = components_table[statusline_type]

if sections then
statusline_str = parse_statusline_sections(sections, statusline_type, winid)
end
end

-- Never return an empty string since setting statusline to an empty string will make it
Expand Down

0 comments on commit 1b632c7

Please sign in to comment.