fix: aerial ignores diff windows (#299)

stevearc · Oct 11, 2023 · c383f45 · c383f45
1 parent c2ed3b9
commit c383f45
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lua/aerial/autocommands.lua b/lua/aerial/autocommands.lua
@@ -82,10 +82,10 @@ M.on_enter_buffer = util.throttle(function()
   local config = require("aerial.config")
   local fold = require("aerial.fold")
   local window = require("aerial.window")
-  backends.attach()
   if util.is_ignored_win() then
     return
   end
+  backends.attach()
 
   local mybuf = vim.api.nvim_get_current_buf()
 

diff --git a/lua/aerial/util.lua b/lua/aerial/util.lua
@@ -267,12 +267,17 @@ end
 ---@return boolean
 ---@return nil|string
 M.is_ignored_win = function(winid)
-  winid = winid or 0
+  if not winid or winid == 0 then
+    winid = vim.api.nvim_get_current_win()
+  end
   local bufnr = vim.api.nvim_win_get_buf(winid)
   local ignore_buf, message = M.is_ignored_buf(bufnr)
   if ignore_buf then
     return ignore_buf, message
   end
+  if vim.wo[winid].diff then
+    return true, "Viewing a diff"
+  end
   local ignore = config.ignore
   if ignore.wintypes then
     local wintype = vim.fn.win_gettype(winid)