Skip to content

Commit

Permalink
feat: option to quite vim if oil is closed as last buffer (#491)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
cdmill and stevearc authored Nov 21, 2024
1 parent 21705a1 commit 81cc9c3
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 4 deletions.
11 changes: 10 additions & 1 deletion lua/oil/actions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,16 @@ M.parent = {

M.close = {
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
Expand Down
16 changes: 13 additions & 3 deletions lua/oil/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,13 @@ M.open = function(dir)
update_preview_window()
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
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 vim.w.is_oil_win then
local original_winid = vim.w.oil_original_win
Expand All @@ -403,9 +408,14 @@ M.close = function()
-- buffer first
local oilbuf = vim.api.nvim_get_current_buf()
ok = pcall(vim.cmd.bprev)
-- If `bprev` failed, there are no buffers open
if not ok then
-- If `bprev` failed, there are no buffers open so we should create a new one with enew
vim.cmd.enew()
-- either exit or create a new blank buffer
if opts.exit_if_last_buf then
vim.cmd.quit()
else
vim.cmd.enew()
end
end
vim.api.nvim_buf_delete(oilbuf, { force = true })
end
Expand Down

0 comments on commit 81cc9c3

Please sign in to comment.