barrett/canola.nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

feat: restore window view in oil.close() (#65)

Browse source
This commit is contained in:
Steven Arcangeli 2023-03-12 13:00:04 -07:00
parent 12bea0f646
commit 33ee724c2d
1 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lua/oil/init.lua
View file

@ -306,11 +306,12 @@ M.close = function()
return return
end end
local ok, bufnr = pcall(vim.api.nvim_win_get_var, 0, "oil_original_buffer") local ok, bufnr = pcall(vim.api.nvim_win_get_var, 0, "oil_original_buffer")
if ok then if ok and vim.api.nvim_buf_is_valid(bufnr) then
if vim.api.nvim_buf_is_valid(bufnr) then vim.api.nvim_win_set_buf(0, bufnr)
vim.api.nvim_win_set_buf(0, bufnr) if vim.w.oil_original_view then
return vim.fn.winrestview(vim.w.oil_original_view)
end end
return
end end
vim.api.nvim_buf_delete(0, { force = true }) vim.api.nvim_buf_delete(0, { force = true })
end end
@ -703,8 +704,9 @@ M.setup = function(opts)
callback = function() callback = function()
local util = require("oil.util") local util = require("oil.util")
if not util.is_oil_bufnr(0) then if not util.is_oil_bufnr(0) then
vim.api.nvim_win_set_var(0, "oil_original_buffer", vim.api.nvim_get_current_buf()) vim.w.oil_original_buffer = vim.api.nvim_get_current_buf()
vim.api.nvim_win_set_var(0, "oil_original_alternate", vim.fn.bufnr("#")) vim.w.oil_original_view = vim.fn.winsaveview()
vim.w.oil_original_alternate = vim.fn.bufnr("#")
end end
end, end,
}) })
@ -792,16 +794,9 @@ M.setup = function(opts)
end end
-- Then transfer over the relevant window vars -- Then transfer over the relevant window vars
vim.w.oil_did_enter = true vim.w.oil_did_enter = true
local has_orig, orig_buffer = vim.w.oil_original_buffer = vim.w[parent_win].oil_original_buffer
pcall(vim.api.nvim_win_get_var, parent_win, "oil_original_buffer") vim.w.oil_original_view = vim.w[parent_win].oil_original_view
if has_orig and vim.api.nvim_buf_is_valid(orig_buffer) then vim.w.oil_original_alternate = vim.w[parent_win].oil_original_alternate
vim.w.oil_original_buffer = orig_buffer
end
local has_orig_alt, alt_buffer =
pcall(vim.api.nvim_win_get_var, parent_win, "oil_original_alternate")
if has_orig_alt and vim.api.nvim_buf_is_valid(alt_buffer) then
vim.w.oil_original_alternate = alt_buffer
end
for k in pairs(config.win_options) do for k in pairs(config.win_options) do
local varname = "_oil_" .. k local varname = "_oil_" .. k
local has_opt, opt = pcall(vim.api.nvim_win_get_var, parent_win, varname) local has_opt, opt = pcall(vim.api.nvim_win_get_var, parent_win, varname)