fix: close side buffers on last main quit (#1)

* test: improve coverage

* fix: add ConfigOptions type with optional fields for setup() user input

Agent-Logs-Url: https://github.com/sand4rt/zen.nvim/sessions/ec375353-ede5-4108-8ceb-0ba933b9a808

Co-authored-by: sand4rt <17591696+sand4rt@users.noreply.github.com>

* fix: remove trailing semicolons and invalid [number]? from LuaDoc annotations

Agent-Logs-Url: https://github.com/sand4rt/zen.nvim/sessions/ec375353-ede5-4108-8ceb-0ba933b9a808

Co-authored-by: sand4rt <17591696+sand4rt@users.noreply.github.com>

* refact

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

Author: sand4rt

Makefile

@@ -4,7 +4,7 @@ DEPS_DIR := $(CURDIR)/deps
 
 # Download mini.nvim if not present, then run all tests
 test: deps
-	nvim --headless -u tests/minimal_init.lua -c "lua MiniTest.run()" 2>&1
+	nvim --headless -u tests/scripts/minimal_init.lua -c "lua MiniTest.run()"
 
 # Clone mini.nvim into deps/
 deps:

lua/zen/init.lua

@@ -4,13 +4,20 @@
 --- @field filetype Filetype
 
 --- @class Config
---- @field main { width: number };
---- @field top Integration[];
---- @field right { min_width: number; [number]: Integration[]};
---- @field bottom Integration[];
---- @field left { min_width: number; [number]: Integration[]};
-
---- @type Config
+--- @field main? { width?: number }
+--- @field top? Integration[]
+--- @field right? { min_width?: number; [number]: Integration[]}
+--- @field bottom? Integration[]
+--- @field left? { min_width?: number; [number]: Integration[]}
+
+--- @class ConfigOptions
+--- @field main { width: number }
+--- @field top Integration[]
+--- @field right { min_width: number; [number]: Integration[]}
+--- @field bottom Integration[]
+--- @field left { min_width: number; [number]: Integration[]}
+
+--- @type ConfigOptions
 local opts = {
 	main = { width = 148 },
 	top = {},
@@ -223,13 +230,13 @@ local function close(filetype)
 	end
 end
 
----@param options Config
+---@param options? Config
 local function setup(options)
 	-- Default splitting will cause your main splits to jump when opening an integration.
 	-- To prevent this, set `splitkeep` to either `screen` or `topline`.
 	vim.opt.splitkeep = "screen"
 
-	---@type Config
+	---@type ConfigOptions
 	opts = vim.tbl_extend("force", opts, options or {})
 
 	vim.api.nvim_create_autocmd("CursorMoved", {
@@ -292,15 +299,30 @@ local function setup(options)
 			if is_popup_window(vim.api.nvim_get_current_win()) then
 				return
 			end
-			if vim.tbl_count(get_editable_files()) == 1 and not is_buff_integration(args.buf) then
-				close_side_buffer("left")
-				close_side_buffer("right")
+			if is_buff_integration(args.buf) then
+				return
+			end
 
-				for _, position in ipairs({ "top", "right", "bottom", "left" }) do
-					for _, integration in pairs(opts[position]) do
-						if type(integration) == "table" then
-							close(integration.filetype)
-						end
+			local editable_count = 0
+			for _, win in ipairs(vim.api.nvim_list_wins()) do
+				if not is_popup_window(win) then
+					local buf = vim.api.nvim_win_get_buf(win)
+					if not is_buff_integration(buf) then
+						editable_count = editable_count + 1
+					end
+				end
+			end
+			if editable_count ~= 1 then
+				return
+			end
+
+			close_side_buffer("left")
+			close_side_buffer("right")
+
+			for _, position in ipairs({ "top", "right", "bottom", "left" }) do
+				for _, integration in pairs(opts[position]) do
+					if type(integration) == "table" then
+						close(integration.filetype)
 					end
 				end
 			end

tests/scripts/helpers.lua

@@ -0,0 +1,34 @@
+local Helpers = {}
+
+Helpers.expect = vim.deepcopy(MiniTest.expect)
+
+local function error_message(str, pattern)
+	return string.format("Pattern: %s\nObserved string: %s", vim.inspect(pattern), str)
+end
+
+Helpers.expect.layout = MiniTest.new_expectation("window layout matches", function(child, expected)
+	local layout = child.lua_func(function()
+		local function enrich(node)
+			if node[1] == "leaf" then
+				local win = node[2]
+				local buf = vim.api.nvim_win_get_buf(win)
+				return {
+					type = "leaf",
+					filetype = vim.bo[buf].filetype,
+					buftype = vim.bo[buf].buftype,
+					width = vim.api.nvim_win_get_width(win),
+					height = vim.api.nvim_win_get_height(win),
+				}
+			end
+			local result = {}
+			for i, n in ipairs(node[2]) do
+				result[i] = enrich(n)
+			end
+			return { type = node[1], children = result }
+		end
+		return enrich(vim.fn.winlayout())
+	end)
+	return Helpers.expect.equality(layout, expected)
+end, error_message)
+
+return Helpers

tests/scripts/init_with_zen.lua

@@ -0,0 +1,8 @@
+vim.cmd([[let &rtp.=','.getcwd()]])
+vim.cmd("set rtp+=deps/mini.nvim")
+
+vim.o.columns = 240
+vim.o.lines = 52
+
+require("mini.test").setup()
+require("zen").setup()

tests/minimal_init.lua tests/scripts/minimal_init.luatests/minimal_init.lua renamed to tests/scripts/minimal_init.lua

@@ -0,0 +1,30 @@
+local Helpers = dofile("tests/scripts/helpers.lua")
+local child = MiniTest.new_child_neovim()
+
+local T = MiniTest.new_set({
+	hooks = {
+		pre_case = function()
+			child.restart({ "-u", "tests/scripts/init_with_zen.lua" })
+		end,
+		post_once = child.stop,
+	},
+})
+
+T["close side buffers on last main quit"] = function()
+	Helpers.expect.layout(child, {
+		type = "row",
+		children = {
+			{ type = "leaf", filetype = "zen-left", buftype = "nofile", width = 46, height = 50 },
+			{ type = "leaf", filetype = "", buftype = "", width = 146, height = 50 },
+			{ type = "leaf", filetype = "zen-right", buftype = "nofile", width = 46, height = 50 },
+		},
+	})
+
+	pcall(child.cmd, "q")
+
+	local STOPPED = 0
+	local exit_code = vim.fn.jobwait({ child.job.id }, 1000)[1]
+	MiniTest.expect.equality(exit_code, STOPPED)
+end
+
+return T

tests/test_closing.lua

@@ -0,0 +1,24 @@
+local Helpers = dofile("tests/scripts/helpers.lua")
+local child = MiniTest.new_child_neovim()
+
+local T = MiniTest.new_set({
+	hooks = {
+		pre_case = function()
+			child.restart({ "-u", "tests/scripts/init_with_zen.lua" })
+		end,
+		post_once = child.stop,
+	},
+})
+
+T["open side buffers on startup"] = function()
+	Helpers.expect.layout(child, {
+		type = "row",
+		children = {
+			{ type = "leaf", filetype = "zen-left", buftype = "nofile", width = 46, height = 50 },
+			{ type = "leaf", filetype = "", buftype = "", width = 146, height = 50 },
+			{ type = "leaf", filetype = "zen-right", buftype = "nofile", width = 46, height = 50 },
+		},
+	})
+end
+
+return T