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

fix: better behaved lazy loading in autocmds

Browse source
This commit is contained in:
Steven Arcangeli 2023-02-04 12:03:19 -08:00
parent 7371dd220f
commit 7f17648705
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lua/oil/init.lua
View file

@ -531,9 +531,8 @@ end
local function restore_alt_buf() local function restore_alt_buf()
local config = require("oil.config") local config = require("oil.config")
local view = require("oil.view")
if vim.bo.filetype == "oil" then if vim.bo.filetype == "oil" then
view.set_win_options() require("oil.view").set_win_options()
vim.api.nvim_win_set_var(0, "oil_did_enter", true) vim.api.nvim_win_set_var(0, "oil_did_enter", true)
elseif vim.w.oil_did_enter then elseif vim.w.oil_did_enter then
vim.api.nvim_win_del_var(0, "oil_did_enter") vim.api.nvim_win_del_var(0, "oil_did_enter")
@ -556,7 +555,7 @@ local function restore_alt_buf()
end end
if config.restore_win_options then if config.restore_win_options then
view.restore_win_options() require("oil.view").restore_win_options()
end end
end end
end end
@ -706,11 +705,10 @@ M.setup = function(opts)
pattern = "*", pattern = "*",
callback = function() callback = function()
local util = require("oil.util") local util = require("oil.util")
local view = require("oil.view")
local bufname = vim.api.nvim_buf_get_name(0) local bufname = vim.api.nvim_buf_get_name(0)
local scheme = util.parse_url(bufname) local scheme = util.parse_url(bufname)
if scheme and config.adapters[scheme] then if scheme and config.adapters[scheme] then
view.maybe_set_cursor() require("oil.view").maybe_set_cursor()
elseif vim.fn.isdirectory(bufname) == 0 then elseif vim.fn.isdirectory(bufname) == 0 then
-- Only run this logic if we are *not* in an oil buffer (and it's not a directory, which -- Only run this logic if we are *not* in an oil buffer (and it's not a directory, which
-- will be replaced by an oil:// url) -- will be replaced by an oil:// url)