fix: some autocmds skipped when opening files from oil (#120)

This commit is contained in:
Steven Arcangeli 2023-06-24 23:28:57 -07:00
parent 8882f6c89e
commit 61f8655e03
2 changed files with 85 additions and 60 deletions

View file

@ -12,7 +12,7 @@ a.describe("oil select", function()
test_util.wait_for_autocmd({ "User", pattern = "OilEnter" })
-- Go to the bottom, so the cursor is not on a directory
vim.cmd.normal({ args = { "G" } })
oil.select()
a.wrap(oil.select, 2)()
assert.equals(1, #vim.api.nvim_tabpage_list_wins(0))
assert.not_equals("oil", vim.bo.filetype)
end)
@ -21,7 +21,7 @@ a.describe("oil select", function()
oil.open()
test_util.wait_for_autocmd({ "User", pattern = "OilEnter" })
local tabpage = vim.api.nvim_get_current_tabpage()
oil.select({ tab = true })
a.wrap(oil.select, 2)({ tab = true })
assert.equals(2, #vim.api.nvim_list_tabpages())
assert.equals(1, #vim.api.nvim_tabpage_list_wins(0))
assert.not_equals(tabpage, vim.api.nvim_get_current_tabpage())
@ -31,7 +31,7 @@ a.describe("oil select", function()
oil.open()
test_util.wait_for_autocmd({ "User", pattern = "OilEnter" })
local winid = vim.api.nvim_get_current_win()
oil.select({ vertical = true })
a.wrap(oil.select, 2)({ vertical = true })
assert.equals(1, #vim.api.nvim_list_tabpages())
assert.equals(2, #vim.api.nvim_tabpage_list_wins(0))
assert.not_equals(winid, vim.api.nvim_get_current_win())
@ -42,7 +42,7 @@ a.describe("oil select", function()
test_util.wait_for_autocmd({ "User", pattern = "OilEnter" })
vim.api.nvim_feedkeys("Vj", "x", true)
local tabpage = vim.api.nvim_get_current_tabpage()
oil.select({ tab = true })
a.wrap(oil.select, 2)({ tab = true })
assert.equals(3, #vim.api.nvim_list_tabpages())
assert.equals(1, #vim.api.nvim_tabpage_list_wins(0))
assert.not_equals(tabpage, vim.api.nvim_get_current_tabpage())
@ -53,7 +53,7 @@ a.describe("oil select", function()
test_util.wait_for_autocmd({ "User", pattern = "OilEnter" })
vim.api.nvim_feedkeys("Vj", "x", true)
local winid = vim.api.nvim_get_current_win()
oil.select({ vertical = true })
a.wrap(oil.select, 2)({ vertical = true })
assert.equals(1, #vim.api.nvim_list_tabpages())
assert.equals(3, #vim.api.nvim_tabpage_list_wins(0))
assert.not_equals(winid, vim.api.nvim_get_current_win())
@ -67,7 +67,7 @@ a.describe("oil select", function()
test_util.wait_for_autocmd({ "User", pattern = "OilEnter" })
-- Go to the bottom, so the cursor is not on a directory
vim.cmd.normal({ args = { "G" } })
oil.select({ close = true })
a.wrap(oil.select, 2)({ close = true })
assert.equals(1, #vim.api.nvim_tabpage_list_wins(0))
-- This one we actually don't expect the buffer to be the same as the initial buffer, because
-- we opened a file
@ -81,7 +81,7 @@ a.describe("oil select", function()
local winid = vim.api.nvim_get_current_win()
oil.open()
test_util.wait_for_autocmd({ "User", pattern = "OilEnter" })
oil.select({ vertical = true, close = true })
a.wrap(oil.select, 2)({ vertical = true, close = true })
assert.equals(2, #vim.api.nvim_tabpage_list_wins(0))
assert.equals(bufnr, vim.api.nvim_win_get_buf(winid))
end)
@ -92,7 +92,7 @@ a.describe("oil select", function()
local tabpage = vim.api.nvim_get_current_tabpage()
oil.open()
test_util.wait_for_autocmd({ "User", pattern = "OilEnter" })
oil.select({ tab = true, close = true })
a.wrap(oil.select, 2)({ tab = true, close = true })
assert.equals(1, #vim.api.nvim_tabpage_list_wins(0))
assert.equals(2, #vim.api.nvim_list_tabpages())
vim.api.nvim_set_current_tabpage(tabpage)