Skip to content

Commit

Permalink
fix(util): abstract different win config structures (#253)
Browse files Browse the repository at this point in the history
  • Loading branch information
ls-devs committed Feb 15, 2024
1 parent 80b67b2 commit 7138c86
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions lua/notify/stages/util.lua
Expand Up @@ -142,22 +142,22 @@ end
function M.slot_after_previous(win, open_windows, direction)
local key = slot_key(direction)
local cmp = is_increasing(direction) and less or greater
local exists, cur_win_conf = pcall(vim.api.nvim_win_get_config, win)
local exists, cur_win_conf = util.get_win_config(win)
if not exists then
return 0
end

local cur_slot = cur_win_conf[key][false]
local cur_slot = cur_win_conf[key]
local win_confs = {}
for _, w in ipairs(open_windows) do
local success, conf = pcall(vim.api.nvim_win_get_config, w)
local success, conf = util.get_win_config(w)
if success then
win_confs[w] = conf
end
end

local preceding_wins = vim.tbl_filter(function(open_win)
return win_confs[open_win] and cmp(win_confs[open_win][key][false], cur_slot)
return win_confs[open_win] and cmp(win_confs[open_win][key], cur_slot)
end, open_windows)

if #preceding_wins == 0 then
Expand All @@ -173,7 +173,7 @@ function M.slot_after_previous(win, open_windows, direction)
end

table.sort(preceding_wins, function(a, b)
return cmp(win_confs[a][key][false], win_confs[b][key][false])
return cmp(win_confs[a][key], win_confs[b][key])
end)

local last_win = preceding_wins[#preceding_wins]
Expand All @@ -182,13 +182,13 @@ function M.slot_after_previous(win, open_windows, direction)
if is_increasing(direction) then
return move_slot(
direction,
last_win_conf[key][false],
last_win_conf[key],
last_win_conf[space_key(direction)] + border_padding(direction, last_win_conf)
)
else
return move_slot(
direction,
last_win_conf[key][false],
last_win_conf[key],
cur_win_conf[space_key(direction)] + border_padding(direction, cur_win_conf)
)
end
Expand Down

0 comments on commit 7138c86

Please sign in to comment.