feat: autoresize when opening / closing other windows (#190)

Author: igorlfs

lua/dap-view/actions.lua

@@ -145,19 +145,24 @@ M.open = function(hide_terminal)
 
     local term_size = term_size__ < 1 and math.floor(go_max * term_size__) or math.floor(term_size__)
 
+    -- Oh lord
+    local height = (
+        is_win_valid and (term_is_vertical and ((is_vertical and size or go.lines) - term_size) or size)
+        or (is_vertical and size or nil)
+    )
+    local width = (
+        is_win_valid and (not term_is_vertical and ((not is_vertical and size or go.columns) - term_size) or size)
+        or (not is_vertical and size or nil)
+    )
+
+    state.og_height = height
+    state.og_width = width
+
     local winnr = api.nvim_open_win(bufnr, false, {
         split = is_win_valid and inv_term_position or win_pos,
         win = is_anchor_win_valid and anchor_win or is_term_win_valid and term_winnr or -1,
-        -- Oh lord
-        height = (
-            is_win_valid and (term_is_vertical and ((is_vertical and size or go.lines) - term_size) or size)
-            or (is_vertical and size or nil)
-        ),
-        width = (
-            is_win_valid
-                and (not term_is_vertical and ((not is_vertical and size or go.columns) - term_size) or size)
-            or (not is_vertical and size or nil)
-        ),
+        height = height,
+        width = width,
     })
 
     -- Restore fixed size

lua/dap-view/autocmds.lua

@@ -9,27 +9,22 @@ local winbar = require("dap-view.options.winbar")
 
 local api = vim.api
 
-api.nvim_create_autocmd("WinClosed", {
-    callback = function(args)
-        local w = vim.w[tonumber(args.file)]
-
-        -- Resize main window on term close to
-        if w.dapview_win_term and util.is_win_valid(state.winnr) then
-            require("dap-view.util.window").resize(state.winnr)
-        end
-
-        -- Similarly for closing main
-        if w.dapview_win and util.is_win_valid(state.term_winnr) then
-            require("dap-view.util.window").resize(state.term_winnr)
-        end
-    end,
-})
-
 api.nvim_create_autocmd({ "WinClosed", "WinNew" }, {
     callback = function()
         vim.schedule(function()
             if util.is_win_valid(state.winnr) then
+                -- Recalculate function labels
                 winbar.refresh_winbar()
+
+                -- Resize when closing unrelated windows (#190)
+                -- We assume that keeping the original size is more important than recalculating
+                -- (if the size was a function)
+                if state.og_height then
+                    api.nvim_win_set_height(state.winnr, state.og_height)
+                end
+                if state.og_width then
+                    api.nvim_win_set_width(state.winnr, state.og_width)
+                end
             end
         end)
     end,

lua/dap-view/state.lua

@@ -35,6 +35,8 @@
 ---@field current_adapter? string
 ---@field subtle_frames boolean
 ---@field current_section? dapview.Section
+---@field og_height? integer
+---@field og_width? integer
 ---@field last_section? dapview.Section
 ---@field last_session_buf? integer
 ---@field exceptions_options table<string,dapview.ExceptionsOption[]>

lua/dap-view/util/window.lua

@@ -1,6 +1,3 @@
-local state = require("dap-view.state")
-local setup = require("dap-view.setup")
-
 local M = {}
 
 local api = vim.api
@@ -29,35 +26,4 @@ M.fetch_window = function(opts)
     end
 end
 
----Restores the configured size for a given window
----@param winnr integer
-M.resize = function(winnr)
-    local wo = vim.wo[winnr]
-
-    local size_ = setup.config.windows.size
-    local size__ = ((type(size_) == "function" and size_(state.win_pos)) or size_)
-
-    ---@cast size__ number
-
-    if wo.winfixheight then
-        wo.winfixheight = false
-
-        local size = math.floor(size__ < 1 and size__ * vim.go.lines or size__)
-
-        api.nvim_win_set_height(state.term_winnr, size)
-
-        wo.winfixheight = true
-    end
-
-    if wo.winfixwidth then
-        wo.winfixwidth = false
-
-        local size = math.floor(size__ < 1 and size__ * vim.go.columns or size__)
-
-        api.nvim_win_set_width(state.term_winnr, size)
-
-        wo.winfixwidth = true
-    end
-end
-
 return M