fix: adjust window width calculation if 'number' or 'relativenumber' (#…

…32)
stevearc · Dec 13, 2021 · a0a46ed · a0a46ed
1 parent e35c609
commit a0a46ed
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/lua/aerial/autocommands.lua b/lua/aerial/autocommands.lua
@@ -55,7 +55,7 @@ M.on_enter_buffer = function()
       vim.cmd("quit")
     else
       -- Hack to ignore winwidth
-      vim.api.nvim_win_set_width(0, util.get_width())
+      util.set_win_width(0, util.get_width(0))
     end
   elseif window.is_open() then
     close_orphans()

diff --git a/lua/aerial/util.lua b/lua/aerial/util.lua
@@ -37,12 +37,23 @@ M.set_width = function(bufnr, width)
 
   for _, winid in ipairs(vim.api.nvim_list_wins()) do
     if vim.api.nvim_win_get_buf(winid) == bufnr then
-      vim.api.nvim_win_set_width(winid, width)
+      M.set_win_width(winid, width)
     end
   end
   return width
 end
 
+M.set_win_width = function(winid, width)
+  -- adjust width if buffer has line numbers
+  if
+    vim.api.nvim_win_get_option(winid, "number")
+    or vim.api.nvim_win_get_option(winid, "relativenumber")
+  then
+    width = math.min(config.max_width, width + vim.api.nvim_win_get_option(winid, "numberwidth"))
+  end
+  vim.api.nvim_win_set_width(winid, width)
+end
+
 M.get_height = function(bufnr)
   local ok, height = pcall(vim.api.nvim_buf_get_var, bufnr or 0, "aerial_height")
   if ok then

diff --git a/lua/aerial/window.lua b/lua/aerial/window.lua
@@ -88,7 +88,6 @@ local function create_aerial_window(bufnr, aer_bufnr, direction, existing_win)
       else
         vim.cmd("noau vertical rightbelow split")
       end
-      api.nvim_win_set_width(0, util.get_width(aer_bufnr))
     end
   else
     util.go_win_no_au(existing_win)