Skip to content

Commit

Permalink
fix(eval): fix regression with unified _eval, add winnr
Browse files Browse the repository at this point in the history
  • Loading branch information
rebelot committed Aug 30, 2022
1 parent 33706b4 commit 6ad825c
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions lua/heirline/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ function M.setup(statusline, winbar, tabline)
end
end

local function _eval(statusline, full_width)
statusline.winnr = 1
local function _eval(statusline, winnr, full_width)
statusline.winnr = winnr
statusline.flexible_components = {}
statusline._buflist = {}
local out = statusline:eval()
Expand All @@ -85,20 +85,22 @@ end

---@return string
function M.eval_statusline()
return _eval(M.statusline, vim.o.laststatus == 3)
local winnr = vim.api.nvim_win_get_number(0)
return _eval(M.statusline, winnr, vim.o.laststatus == 3)
end

---@return string
function M.eval_winbar()
return _eval(M.winbar, false)
local winnr = vim.api.nvim_win_get_number(0)
return _eval(M.winbar, winnr, false)
end

---@return string
function M.eval_tabline()
return _eval(M.tabline, true)
local winnr = 1
return _eval(M.tabline, winnr, true)
end


-- test [[
function M.timeit()
local start = os.clock()
Expand Down

0 comments on commit 6ad825c

Please sign in to comment.