feat: option to quite vim if oil is closed as last buffer (#491)
* feat: auto-quit vim if oil is closed as last buffer * rename auto_close_vim to auto_close_last_buffer * rework actions.close to be more like actions.cd * fix: configure close action correctly * add type annotation, future proofing * fix: typo * fix: typo * refactor: better type annotations and backwards compatibility --------- Co-authored-by: Steven Arcangeli <506791+stevearc@users.noreply.github.com>
This commit is contained in:
parent
21705a1deb
commit
81cc9c3f62
2 changed files with 23 additions and 4 deletions
|
|
@ -143,7 +143,16 @@ M.parent = {
|
||||||
|
|
||||||
M.close = {
|
M.close = {
|
||||||
desc = "Close oil and restore original buffer",
|
desc = "Close oil and restore original buffer",
|
||||||
callback = oil.close,
|
callback = function(opts)
|
||||||
|
opts = opts or {}
|
||||||
|
oil.close(opts)
|
||||||
|
end,
|
||||||
|
parameters = {
|
||||||
|
exit_if_last_buf = {
|
||||||
|
type = "boolean",
|
||||||
|
desc = "Exit vim if oil is closed as the last buffer",
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
---@param cmd string
|
---@param cmd string
|
||||||
|
|
|
||||||
|
|
@ -379,8 +379,13 @@ M.open = function(dir)
|
||||||
update_preview_window()
|
update_preview_window()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---@class oil.CloseOpts
|
||||||
|
---@field exit_if_last_buf? boolean Exit vim if this oil buffer is the last open buffer
|
||||||
|
|
||||||
---Restore the buffer that was present when oil was opened
|
---Restore the buffer that was present when oil was opened
|
||||||
M.close = function()
|
---@param opts? oil.CloseOpts
|
||||||
|
M.close = function(opts)
|
||||||
|
opts = opts or {}
|
||||||
-- If we're in a floating oil window, close it and try to restore focus to the original window
|
-- If we're in a floating oil window, close it and try to restore focus to the original window
|
||||||
if vim.w.is_oil_win then
|
if vim.w.is_oil_win then
|
||||||
local original_winid = vim.w.oil_original_win
|
local original_winid = vim.w.oil_original_win
|
||||||
|
|
@ -403,9 +408,14 @@ M.close = function()
|
||||||
-- buffer first
|
-- buffer first
|
||||||
local oilbuf = vim.api.nvim_get_current_buf()
|
local oilbuf = vim.api.nvim_get_current_buf()
|
||||||
ok = pcall(vim.cmd.bprev)
|
ok = pcall(vim.cmd.bprev)
|
||||||
|
-- If `bprev` failed, there are no buffers open
|
||||||
if not ok then
|
if not ok then
|
||||||
-- If `bprev` failed, there are no buffers open so we should create a new one with enew
|
-- either exit or create a new blank buffer
|
||||||
vim.cmd.enew()
|
if opts.exit_if_last_buf then
|
||||||
|
vim.cmd.quit()
|
||||||
|
else
|
||||||
|
vim.cmd.enew()
|
||||||
|
end
|
||||||
end
|
end
|
||||||
vim.api.nvim_buf_delete(oilbuf, { force = true })
|
vim.api.nvim_buf_delete(oilbuf, { force = true })
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue