fix: add guards for unloaded buffers (#296)

stevearc · Sep 27, 2023 · d7577c6 · d7577c6
1 parent 1175f79
commit d7577c6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lua/aerial/render.lua b/lua/aerial/render.lua
@@ -79,7 +79,7 @@ end
 -- Update the aerial buffer from cached symbols
 M.update_aerial_buffer = function(buf)
   buf = buf or 0
-  if not vim.api.nvim_buf_is_valid(buf) then
+  if not vim.api.nvim_buf_is_valid(buf) or not vim.api.nvim_buf_is_loaded(buf) then
     return
   end
   local bufnr, aer_bufnr = util.get_buffers(buf)
@@ -200,7 +200,7 @@ end
 ---Update the highlighted lines in the aerial buffer
 ---@param buf integer
 M.update_highlights = function(buf)
-  if not vim.api.nvim_buf_is_valid(buf) then
+  if not vim.api.nvim_buf_is_valid(buf) or not vim.api.nvim_buf_is_loaded(buf) then
     return
   end
   local hl_mode = config.highlight_mode

diff --git a/lua/aerial/util.lua b/lua/aerial/util.lua
@@ -155,7 +155,12 @@ end
 ---@return nil|integer
 M.get_buffer_from_var = function(bufnr, varname)
   local status, result_bufnr = pcall(vim.api.nvim_buf_get_var, bufnr, varname)
-  if not status or result_bufnr == nil or not vim.api.nvim_buf_is_valid(result_bufnr) then
+  if
+    not status
+    or result_bufnr == nil
+    or not vim.api.nvim_buf_is_valid(result_bufnr)
+    or not vim.api.nvim_buf_is_loaded(result_bufnr)
+  then
     return nil
   end
   return result_bufnr