Skip to content

Commit

Permalink
Work on adjusting neighbors tests, minor fixes
Browse files Browse the repository at this point in the history 
[skip ci]
  • Loading branch information
@MisanthropicBit
MisanthropicBit committed May 10, 2024
1 parent 84a8560 commit 12cc07a
Show file tree
Hide file tree
Showing 3 changed files with 295 additions and 3 deletions.
1 change: 1 addition & 0 deletions lua/winmove/util/test_helpers.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ end
---@alias SkeletonWinLayout string | SkeletonRow | SkeletonCol

---@param layout SkeletonWinLayout
---@return table<string, integer>
function test_helpers.make_layout(layout)
local win_ids = {}

Expand Down
295 changes: 292 additions & 3 deletions tests/resize_adjust_neighbors_spec.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,296 @@ local test_helpers = require("winmove.util.test_helpers")
local given = vader.given
local make_layout = test_helpers.make_layout

describe("adjusts neighbors", function()
local count = 3
assert:set_parameter("TableFormatLevel", 10)
describe("resize", function()
describe("adjusts neighbors", function()
local count = 3
assert:set_parameter("TableFormatLevel", 10)

---@param win_id integer
---@return integer
---@return integer
---@return integer
---@return integer
local function get_win_pos_and_dimensions(win_id)
local pos = vim.api.nvim_win_get_position(win_id)
local width = vim.api.nvim_win_get_width(win_id)
local height = vim.api.nvim_win_get_height(win_id)

return pos[1], pos[2], width, height
end

it("resizes towards non-sibling window", function()
given(function()
local layout = make_layout({
"row",
{
"neighbor3",
{
"col",
{
{
"row",
{ "neighbor2", "neighbor1", "main" },
},
"bottom neighbor",
},
},
"neighbor4",
},
})

local win_id = layout["main"]

assert.matches_winlayout(vim.fn.winlayout(), {
"row",
{
{ "leaf" },
{
"col",
{
{
"row",
{
{ "leaf" },
{ "leaf" },
{ "leaf" },
},
},
{ "leaf" },
},
},
{ "leaf" },
},
})

for _, _win_id in ipairs(vim.api.nvim_tabpage_list_wins(0)) do
vim.api.nvim_set_current_win(_win_id)
vim.opt_local.winwidth = 10
end

vim.api.nvim_set_current_win(win_id)

local _, main_col_before, main_width_before, _ = get_win_pos_and_dimensions(win_id)
local _, col_before1, width_before1, _ = get_win_pos_and_dimensions(layout["neighbor1"])
local _, col_before2, width_before2, _ = get_win_pos_and_dimensions(layout["neighbor2"])
local _, col_before3, width_before3, _ = get_win_pos_and_dimensions(layout["neighbor3"])
local _, bottom_col_before, bottom_width_before, _ = get_win_pos_and_dimensions(layout["bottom neighbor"])
local _, col_before4, width_before4, _ = get_win_pos_and_dimensions(layout["neighbor4"])

winmove.resize_window(win_id, "l", count, winmove.ResizeAnchor.TopLeft)

local _, main_col_after, main_width_after, _ = get_win_pos_and_dimensions(win_id)
local _, col_after1, width_after1, _ = get_win_pos_and_dimensions(layout["neighbor1"])
local _, col_after2, width_after2, _ = get_win_pos_and_dimensions(layout["neighbor2"])
local _, col_after3, width_after3, _ = get_win_pos_and_dimensions(layout["neighbor3"])
local _, bottom_col_after, bottom_width_after, _ = get_win_pos_and_dimensions(layout["bottom neighbor"])
local _, col_after4, width_after4, _ = get_win_pos_and_dimensions(layout["neighbor4"])

assert.are.same(main_col_before, main_col_after)
assert.are.same(main_width_before + count, main_width_after)

assert.are.same(col_before1, col_after1)
assert.are.same(width_before1, width_after1)

assert.are.same(col_before2, col_after2)
assert.are.same(width_before2, width_after2)

assert.are.same(col_before3, col_after3)
assert.are.same(width_before3, width_after3)

assert.are.same(bottom_col_before, bottom_col_after)
assert.are.same(bottom_width_before + count, bottom_width_after)

assert.are.same(col_before4 + count, col_after4)
assert.are.same(width_before4 - count, width_after4)
end)
end)

it("resizes towards multiple sibling windows", function()
given(function()
local layout = make_layout({
"row",
{
"neighbor1",
{
"col",
{
{
"row",
{ "neighbor2", "neighbor3", "main" },
},
"bottom neighbor",
},
},
"neighbor4",
},
})

local win_id = layout["main"]

assert.matches_winlayout(vim.fn.winlayout(), {
"row",
{
{ "leaf" },
{
"col",
{
{
"row",
{
{ "leaf" },
{ "leaf" },
{ "leaf" },
},
},
{ "leaf" },
},
},
{ "leaf" },
},
})

for _, _win_id in ipairs(vim.api.nvim_tabpage_list_wins(0)) do
vim.api.nvim_win_call(_win_id, function()
vim.opt_local.winwidth = 10
end)
end

vim.api.nvim_set_current_win(win_id)

local _, main_col_before, main_width_before, _ = get_win_pos_and_dimensions(win_id)
local _, col_before1, width_before1, _ = get_win_pos_and_dimensions(layout["neighbor1"])
local _, col_before2, width_before2, _ = get_win_pos_and_dimensions(layout["neighbor2"])
local _, col_before3, width_before3, _ = get_win_pos_and_dimensions(layout["neighbor3"])
local _, bottom_col_before, bottom_width_before, _ = get_win_pos_and_dimensions(layout["bottom neighbor"])
local _, col_before4, width_before4, _ = get_win_pos_and_dimensions(layout["neighbor4"])

winmove.resize_window(win_id, "h", count, winmove.ResizeAnchor.BottomRight)

local _, main_col_after, main_width_after, _ = get_win_pos_and_dimensions(win_id)
local _, col_after1, width_after1, _ = get_win_pos_and_dimensions(layout["neighbor1"])
local _, col_after2, width_after2, _ = get_win_pos_and_dimensions(layout["neighbor2"])
local _, col_after3, width_after3, _ = get_win_pos_and_dimensions(layout["neighbor3"])
local _, bottom_col_after, bottom_width_after, _ = get_win_pos_and_dimensions(layout["bottom neighbor"])
local _, col_after4, width_after4, _ = get_win_pos_and_dimensions(layout["neighbor4"])

assert.are.same(main_col_before - count, main_col_after)
assert.are.same(main_width_before + count, main_width_after)

assert.are.same(col_before1, col_after1)
assert.are.same(width_before1, width_after1)

assert.are.same(col_before2, col_after2)
assert.are.same(width_before2, width_after2)

assert.are.same(col_before3, col_after3)
assert.are.same(width_before3 - count, width_after3)

assert.are.same(bottom_col_before, bottom_col_after)
assert.are.same(bottom_width_before, bottom_width_after)

assert.are.same(col_before4, col_after4)
assert.are.same(width_before4, width_after4)
end)
end)

it("resizes towards multiple sibling windows and respects window dimension settings", function()
given(function()
local layout = make_layout({
"row",
{
"neighbor1",
{
"col",
{
{
"row",
{ "neighbor2", "neighbor3", "main" },
},
"bottom neighbor",
},
},
"neighbor4",
},
})

local win_id = layout["main"]

assert.matches_winlayout(vim.fn.winlayout(), {
"row",
{
{ "leaf" },
{
"col",
{
{
"row",
{
{ "leaf" },
{ "leaf" },
{ "leaf" },
},
},
{ "leaf" },
},
},
{ "leaf" },
},
})

---@type table<integer, integer>
local minwidth_map = {}

for _, _win_id in ipairs(vim.api.nvim_tabpage_list_wins(0)) do
vim.api.nvim_win_call(_win_id, function()
local minwidth = vim.api.nvim_win_get_width(win_id) - count
vim.opt_local.winwidth = minwidth
minwidth_map[_win_id] = minwidth
end)
end

vim.api.nvim_set_current_win(win_id)

local _, main_col_before, main_width_before, _ = get_win_pos_and_dimensions(win_id)
local _, col_before1, width_before1, _ = get_win_pos_and_dimensions(layout["neighbor1"])
local _, col_before2, width_before2, _ = get_win_pos_and_dimensions(layout["neighbor2"])
local _, col_before3, width_before3, _ = get_win_pos_and_dimensions(layout["neighbor3"])
local _, bottom_col_before, bottom_width_before, _ = get_win_pos_and_dimensions(layout["bottom neighbor"])
local _, col_before4, width_before4, _ = get_win_pos_and_dimensions(layout["neighbor4"])

for _ = 1, 10 do
winmove.resize_window(win_id, "h", count, winmove.ResizeAnchor.BottomRight)
end

local _, main_col_after, main_width_after, _ = get_win_pos_and_dimensions(win_id)
local _, col_after1, width_after1, _ = get_win_pos_and_dimensions(layout["neighbor1"])
local _, col_after2, width_after2, _ = get_win_pos_and_dimensions(layout["neighbor2"])
local _, col_after3, width_after3, _ = get_win_pos_and_dimensions(layout["neighbor3"])
local _, bottom_col_after, bottom_width_after, _ = get_win_pos_and_dimensions(layout["bottom neighbor"])
local _, col_after4, width_after4, _ = get_win_pos_and_dimensions(layout["neighbor4"])

assert.are.same(vim.api.nvim_win_get_width(layout["neighbor1"]), minwidth_map[layout["neighbor1"]])
assert.are.same(vim.api.nvim_win_get_width(layout["neighbor2"]), minwidth_map[layout["neighbor2"]])
assert.are.same(vim.api.nvim_win_get_width(layout["neighbor3"]), minwidth_map[layout["neighbor3"]])

-- assert.are.same(main_col_before - count, main_col_after)
-- assert.are.same(main_width_before + count, main_width_after)

assert.are.same(col_before1, col_after1)
-- assert.are.same(width_before1, width_after1)

-- assert.are.same(col_before2, col_after2)
-- assert.are.same(width_before2, width_after2)

-- assert.are.same(col_before3, col_after3)
-- assert.are.same(width_before3 - count, width_after3)

-- assert.are.same(bottom_col_before, bottom_col_after)
-- assert.are.same(bottom_width_before, bottom_width_after)

assert.are.same(col_before4, col_after4)
assert.are.same(width_before4, width_after4)
end)
end)
end)
end)
2 changes: 2 additions & 0 deletions tests/resize_bottom_right_anchor_spec.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ describe("resize", function()
local count = 3
assert:set_parameter("TableFormatLevel", 10)

-- TODO: Move to test_helpers

---@param win_id integer
---@return integer
---@return integer
Expand Down

0 comments on commit 12cc07a

Please sign in to comment.