fix: layout shift

Author: sand4rt

lua/zen/init.lua

@@ -27,8 +27,9 @@ local opts = {
 	bottom = {},
 	left = { { filetype = "*", min_width = 46 } },
 }
+--- @type table<number, { left: number, right: number }>
 local state = {
-	[vim.api.nvim_get_current_tabpage()] = { left = nil, right = nil },
+	[vim.api.nvim_get_current_tabpage()] = { left = -1, right = -1 },
 }
 
 local function get_main_width()
@@ -77,18 +78,19 @@ local function is_filetype(target, filetype)
 	return false
 end
 
----@param position "left" | "right"
+---@param position "top" | "right" | "bottom" | "left"
 ---@param filetype string
 ---@return number
 local function get_min_width(position, filetype)
 	local wildcard_width = 0
 	for _, integration in ipairs(opts[position]) do
 		if type(integration) == "table" then
-			if integration.min_width and integration.filetype ~= "*" and is_filetype(filetype, integration.filetype) then
-				return integration.min_width
+			local min_w = integration.min_width or 0
+			if min_w > 0 and integration.filetype ~= "*" and is_filetype(filetype, integration.filetype) then
+				return min_w
 			end
-			if integration.filetype == "*" and integration.min_width then
-				wildcard_width = integration.min_width
+			if integration.filetype == "*" and min_w > 0 then
+				wildcard_width = min_w
 			end
 		end
 	end
@@ -130,6 +132,18 @@ local function filetypes_visible(filetypes)
 	return false
 end
 
+---@param list string[]
+---@param filetype Filetype
+local function append_filetype(list, filetype)
+	if type(filetype) == "table" then
+		for _, ft in ipairs(filetype) do
+			table.insert(list, ft)
+		end
+	else
+		table.insert(list, filetype)
+	end
+end
+
 ---@param filetypes string[]
 ---@param type_to_remove string
 local function remove_file_type(filetypes, type_to_remove)
@@ -150,8 +164,7 @@ local function is_buff_integration(buf)
 	end
 	for _, position in ipairs({ "left", "right", "top", "bottom" }) do
 		for _, integration in ipairs(opts[position] or {}) do
-			---@diagnostic disable-next-line: undefined-field
-			if type(integration) == "table" and is_filetype(filetype, integration.filetype) then
+				if type(integration) == "table" and is_filetype(filetype, integration.filetype) then
 				return true
 			end
 		end
@@ -195,14 +208,6 @@ local function get_vsplits()
 	return vsplits
 end
 
----@return boolean
-local function is_hsplit(buf)
-	local win_id = vim.fn.bufwinid(buf)
-	local width = vim.api.nvim_win_get_width(win_id)
-	local height = vim.api.nvim_win_get_height(win_id)
-	return width > height
-end
-
 ---@param position "top" | "right" | "bottom" | "left"
 ---@return boolean
 local function is_integration_open(position)
@@ -232,11 +237,55 @@ local function get_window_by_filetype(filetype)
 	return nil
 end
 
-local function adjust_top_bottom_window_hack(target_window, position)
-	if target_window then
-		vim.api.nvim_win_call(target_window, function()
-			vim.cmd("wincmd " .. position)
-		end)
+local _saved_position_heights = {}
+local _in_handler = false
+
+local function save_top_bottom_heights()
+	for _, position in ipairs({ "top", "bottom" }) do
+		for _, integration in pairs(opts[position]) do
+			if type(integration) == "table" then
+				local win = get_window_by_filetype(integration.filetype)
+				if win then
+					local w = vim.api.nvim_win_get_width(win)
+					-- only save when integration spans full width (properly positioned)
+					if w == vim.o.columns then
+						_saved_position_heights[position] = vim.api.nvim_win_get_height(win)
+					end
+					break
+				end
+			end
+		end
+	end
+end
+
+local function reposition_top_bottom_integrations()
+	for _, integration in pairs(opts.top) do
+		local win = get_window_by_filetype(integration.filetype)
+		if win then
+			local needs_reposition = vim.api.nvim_win_get_width(win) ~= vim.o.columns
+			if needs_reposition then
+				local height_before = vim.api.nvim_win_get_height(win)
+				vim.api.nvim_win_set_config(win, { split = "above", win = -1 })
+				vim.api.nvim_win_set_height(win, _saved_position_heights.top or height_before)
+			elseif _saved_position_heights.top then
+				vim.api.nvim_win_set_height(win, _saved_position_heights.top)
+			end
+			_saved_position_heights.top = vim.api.nvim_win_get_height(win)
+		end
+	end
+	for _, integration in pairs(opts.bottom) do
+		local win = get_window_by_filetype(integration.filetype)
+		if win then
+			local needs_reposition = vim.api.nvim_win_get_width(win) ~= vim.o.columns
+			if needs_reposition then
+				local height_before = vim.api.nvim_win_get_height(win)
+				vim.api.nvim_win_set_config(win, { split = "below", win = -1 })
+				vim.api.nvim_win_set_height(win, _saved_position_heights.bottom or height_before)
+			elseif _saved_position_heights.bottom then
+				vim.api.nvim_win_set_height(win, _saved_position_heights.bottom)
+			end
+			_saved_position_heights.bottom = vim.api.nvim_win_get_height(win)
+		end
 	end
 end
 
@@ -271,28 +320,6 @@ local function setup(options)
 	---@type ConfigOptions
 	opts = vim.tbl_extend("force", opts, options or {})
 
-	vim.api.nvim_create_autocmd("CursorMoved", {
-		-- TODO: use pattern for better perf
-		callback = function(args)
-			if is_buff_integration(args.buf) then
-				local buf_info = vim.fn.getbufinfo(args.buf)
-
-				local filetype = vim.api.nvim_get_option_value("filetype", { buf = args.buf })
-				for _, position in ipairs({ "right", "left" }) do
-					for _, integration in pairs(opts[position]) do
-						---@diagnostic disable-next-line: undefined-field
-						if type(integration) == "table" and is_filetype(filetype, integration.filetype) then
-							local new_width = math.max(get_min_width(position, filetype), math.floor((vim.o.columns - get_main_width()) / 2))
-							vim.api.nvim_win_set_width(buf_info[1].windows[1], new_width)
-							return
-						end
-					end
-				end
-			end
-		end,
-		desc = "HACK: adjust the integration when opening",
-	})
-
 	vim.api.nvim_create_autocmd({ "VimEnter", "TabNew" }, {
 		callback = function()
 			-- disable when window is too small
@@ -317,9 +344,10 @@ local function setup(options)
 		callback = function()
 			if vim.bo.filetype == "zen-left" then
 				vim.cmd("wincmd l")
-			end
-			if vim.bo.filetype == "zen-right" then
+			elseif vim.bo.filetype == "zen-right" then
 				vim.cmd("wincmd h")
+			else
+				save_top_bottom_heights()
 			end
 		end,
 		desc = "Prevent the cursor from moving to the side buffers.",
@@ -419,25 +447,37 @@ local function setup(options)
 				return
 			end
 
-			local left_file_types = { "fugitiveblame", "fyler", "undotree", "dbui", "zen-left" }
+			-- save top/bottom integration heights before recreating zen buffers
+			if not _in_handler then
+				save_top_bottom_heights()
+			end
+
+			local left_file_types = { "zen-left" }
+			for _, integration in ipairs(opts.left) do
+				if type(integration) == "table" and integration.filetype ~= "*" then
+					append_filetype(left_file_types, integration.filetype)
+				end
+			end
 			remove_file_type(left_file_types, file_type)
 			if not filetypes_visible(left_file_types) then
 				state[vim.api.nvim_get_current_tabpage()].left = create_window("left")
 				vim.cmd("wincmd l")
 			end
 
-			local right_file_types = { "dapui_scopes", "neotest-summary", "zen-right" }
+			local right_file_types = { "zen-right" }
+			for _, integration in ipairs(opts.right) do
+				if type(integration) == "table" and integration.filetype ~= "*" then
+					append_filetype(right_file_types, integration.filetype)
+				end
+			end
 			remove_file_type(right_file_types, file_type)
 			if not filetypes_visible(right_file_types) then
 				state[vim.api.nvim_get_current_tabpage()].right = create_window("right")
 				vim.cmd("wincmd h")
 			end
 
-			for _, integration in pairs(opts.top) do
-				adjust_top_bottom_window_hack(get_window_by_filetype(integration.filetype), "K")
-			end
-			for _, integration in pairs(opts.bottom) do
-				adjust_top_bottom_window_hack(get_window_by_filetype(integration.filetype), "J")
+			if not _in_handler then
+				reposition_top_bottom_integrations()
 			end
 			resize_side_buffers()
 		end,
@@ -464,11 +504,15 @@ local function setup(options)
 				return
 			end
 
-			for _, position in ipairs({ "top", "right", "bottom", "left" }) do
+			_in_handler = true
+
+			---@type ("top"|"right"|"bottom"|"left")[]
+			local positions = { "top", "right", "bottom", "left" }
+			for _, position in ipairs(positions) do
 				for _, integration in pairs(opts[position]) do
 					if type(integration) == "table" and is_filetype(filetype, integration.filetype) then
 						close_side_buffer(position)
-						for _, position_inner in ipairs({ "top", "right", "bottom", "left" }) do
+						for _, position_inner in ipairs(positions) do
 							for _, integration_inner in pairs(opts[position_inner]) do
 								if
 									position_inner == position
@@ -481,32 +525,19 @@ local function setup(options)
 						end
 
 						if position == "left" or position == "right" then
-							local min_width = get_min_width(position, filetype)
-							if min_width > 0 then
-								local win = vim.fn.bufwinid(args.buf)
-								if win ~= -1 then
-									local current_width = vim.api.nvim_win_get_width(win)
-									if current_width < min_width then
-										vim.api.nvim_win_set_width(win, min_width)
-									end
-								end
+							local new_width = math.max(get_min_width(position, filetype), math.floor((vim.o.columns - get_main_width()) / 2))
+							local win = vim.fn.bufwinid(args.buf)
+							if win ~= -1 then
+								vim.api.nvim_win_set_width(win, new_width)
 							end
 						end
 					end
 				end
 			end
 
-			for _, integration in pairs(opts.top) do
-				if not is_hsplit(args.buf) then
-					adjust_top_bottom_window_hack(get_window_by_filetype(integration.filetype), "K")
-				end
-			end
-			for _, integration in pairs(opts.bottom) do
-				if not is_hsplit(args.buf) then
-					adjust_top_bottom_window_hack(get_window_by_filetype(integration.filetype), "J")
-				end
-			end
+			reposition_top_bottom_integrations()
 			resize_side_buffers()
+			_in_handler = false
 		end,
 		desc = "Close side buffer plugins if another plugin is already occupying that side.",
 	})