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

fixup: don't take over stl/wbr/tbl opts in ingnored filetypes

This commit is contained in:
shadmansaleh 2022-07-28 11:02:12 +06:00
parent b378660841
commit e9b05e7f35
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lua/lualine.lua
View File

@ -276,7 +276,7 @@ local function status_dispatch(sec_name)
) )
then then
-- disable on specific filetypes -- disable on specific filetypes
return '' return nil
end end
local extension_sections = get_extension_sections(current_ft, is_focused, sec_name) local extension_sections = get_extension_sections(current_ft, is_focused, sec_name)
if extension_sections ~= nil then if extension_sections ~= nil then
@ -299,7 +299,7 @@ end
---@class LualineRefreshOpts ---@class LualineRefreshOpts
---@field kind LualineRefreshOptsKind ---@field kind LualineRefreshOptsKind
---@field place LualineRefreshOptsPlace[] ---@field place LualineRefreshOptsPlace[]
---@field trigger 'autocmd'|'timer'|'unknown' ---@field trigger 'autocmd'|'autocmd_redired|timer'|'unknown'
--- Refresh contents of lualine --- Refresh contents of lualine
---@param opts LualineRefreshOpts ---@param opts LualineRefreshOpts
local function refresh(opts) local function refresh(opts)
@ -315,7 +315,7 @@ local function refresh(opts)
-- workaround for https://github.com/nvim-lualine/lualine.nvim/issues/751 -- workaround for https://github.com/nvim-lualine/lualine.nvim/issues/751
-- workaround for https://github.com/nvim-lualine/lualine.nvim/issues/755 -- workaround for https://github.com/nvim-lualine/lualine.nvim/issues/755
if opts.trigger == 'autocmd' then if opts.trigger == 'autocmd' then
opts.trigger = 'timer' opts.trigger = 'autocmd_redired'
vim.defer_fn(function() vim.defer_fn(function()
M.refresh(opts) M.refresh(opts)
end, 50) end, 50)
@ -345,18 +345,30 @@ local function refresh(opts)
-- update them -- update them
if vim.tbl_contains(opts.place, 'statusline') then if vim.tbl_contains(opts.place, 'statusline') then
for _, win in ipairs(wins) do for _, win in ipairs(wins) do
modules.nvim_opts.set('statusline', vim.api.nvim_win_call(win, M.statusline), { window = win }) local stl_cur = vim.api.nvim_win_call(win, M.statusline)
local stl_last = modules.nvim_opts.get_cache('statusline', { window = win })
if stl_cur or stl_last then
modules.nvim_opts.set('statusline', stl_cur, { window = win })
end
end end
end end
if vim.tbl_contains(opts.place, 'winbar') then if vim.tbl_contains(opts.place, 'winbar') then
for _, win in ipairs(wins) do for _, win in ipairs(wins) do
if vim.api.nvim_win_get_height(win) > 1 then if vim.api.nvim_win_get_height(win) > 1 then
modules.nvim_opts.set('winbar', vim.api.nvim_win_call(win, M.winbar), { window = win }) local wbr_cur = vim.api.nvim_win_call(win, M.winbar)
local wbr_last = modules.nvim_opts.get_cache('winbar', { window = win })
if wbr_cur or wbr_last then
modules.nvim_opts.set('winbar', wbr_cur, { window = win })
end
end end
end end
end end
if vim.tbl_contains(opts.place, 'tabline') then if vim.tbl_contains(opts.place, 'tabline') then
modules.nvim_opts.set('tabline', vim.api.nvim_win_call(vim.api.nvim_get_current_win(), tabline), { global = true }) local tbl_cur = vim.api.nvim_win_call(vim.api.nvim_get_current_win(), tabline)
local tbl_last = modules.nvim_opts.get_cache('tabline', { global = true })
if tbl_cur or tbl_last then
modules.nvim_opts.set('tabline', tbl_cur, { global = true })
end
end end
vim.g.actual_curwin = old_actual_curwin vim.g.actual_curwin = old_actual_curwin