refactor(core): Changed how different methods work

Author: OXY2DEV

lua/bars/statuscolumn.lua

@@ -453,33 +453,6 @@ end
 
 ----------------------------------------------------------------------
 
---- Toggles state of given window.
----@param window integer
-statuscolumn.toggle = function (window)
-	if type(window) ~= "number" or statuscolumn.state.attached_windows[window] == nil then
-		return;
-	elseif statuscolumn.state.attached_windows[window] == true then
-		statuscolumn.detach(window);
-	else
-		statuscolumn.attach(window, true);
-	end
-end
-
---- Toggles statuscolumn **globally**.
-statuscolumn.Toggle = function ()
-	--- true -> false,
-	--- false -> true
-	statuscolumn.state.enable = not statuscolumn.state.enable;
-
-	for window, state in pairs(statuscolumn.state.attached_windows) do
-		if state ~= nil then
-			statuscolumn.toggle(window);
-		end
-	end
-end
-
-----------------------------------------------------------------------
-
 --- Enables statuscolumn for `window`.
 ---@param window integer
 statuscolumn.enable = function (window)
@@ -496,7 +469,7 @@ statuscolumn.Enable = function ()
 
 	for window, state in pairs(statuscolumn.state.attached_windows) do
 		if state ~= true then
-			statuscolumn.attach(window);
+			statuscolumn.enable(window);
 		end
 	end
 end
@@ -515,7 +488,7 @@ end
 statuscolumn.Disable = function ()
 	for window, state in pairs(statuscolumn.state.attached_windows) do
 		if state ~= false then
-			statuscolumn.detach(window);
+			statuscolumn.disable(window);
 		end
 	end
 
@@ -524,6 +497,29 @@ end
 
 ----------------------------------------------------------------------
 
+--- Toggles state of given window.
+---@param window integer
+statuscolumn.toggle = function (window)
+	if type(window) ~= "number" or statuscolumn.state.attached_windows[window] == nil then
+		return;
+	elseif statuscolumn.state.attached_windows[window] == true then
+		statuscolumn.disable(window);
+	else
+		statuscolumn.enable(window);
+	end
+end
+
+--- Toggles statuscolumn **globally**.
+statuscolumn.Toggle = function ()
+	if statuscolumn.state.enable == true then
+		statuscolumn.Disable();
+	else
+		statuscolumn.Enable();
+	end
+end
+
+----------------------------------------------------------------------
+
 --- Sets up the statuscolumn module.
 ---@param config statuscolumn.config | nil
 statuscolumn.setup = function (config)

lua/bars/statusline.lua

@@ -676,33 +676,6 @@ end
 
 ----------------------------------------------------------------------
 
---- Toggles state of given window.
----@param window integer
-statusline.toggle = function (window)
-	if type(window) ~= "number" or statusline.state.attached_windows[window] == nil then
-		return;
-	elseif statusline.state.attached_windows[window] == true then
-		statusline.detach(window);
-	else
-		statusline.attach(window, true);
-	end
-end
-
---- Toggles statusline **globally**.
-statusline.Toggle = function ()
-	--- true -> false,
-	--- false -> true
-	statusline.state.enable = not statusline.state.enable;
-
-	for window, state in pairs(statusline.state.attached_windows) do
-		if state ~= nil then
-			statusline.toggle(window);
-		end
-	end
-end
-
-----------------------------------------------------------------------
-
 --- Enables statusline for `window`.
 ---@param window integer
 statusline.enable = function (window)
@@ -719,7 +692,7 @@ statusline.Enable = function ()
 
 	for window, state in pairs(statusline.state.attached_windows) do
 		if state ~= true then
-			statusline.attach(window);
+			statusline.enable(window);
 		end
 	end
 end
@@ -738,7 +711,7 @@ end
 statusline.Disable = function ()
 	for window, state in pairs(statusline.state.attached_windows) do
 		if state ~= false then
-			statusline.detach(window);
+			statusline.disable(window);
 		end
 	end
 
@@ -747,6 +720,29 @@ end
 
 ----------------------------------------------------------------------
 
+--- Toggles state of given window.
+---@param window integer
+statusline.toggle = function (window)
+	if type(window) ~= "number" or statusline.state.attached_windows[window] == nil then
+		return;
+	elseif statusline.state.attached_windows[window] == true then
+		statusline.disable(window);
+	else
+		statusline.enable(window);
+	end
+end
+
+--- Toggles statusline **globally**.
+statusline.Toggle = function ()
+	if statusline.state.enable == true then
+		statusline.Disable();
+	else
+		statusline.Enable();
+	end
+end
+
+----------------------------------------------------------------------
+
 --- Sets up the statusline module.
 ---@param config statusline.config | nil
 statusline.setup = function (config)

lua/bars/tabline.lua

@@ -281,26 +281,6 @@ end
 
 ----------------------------------------------------------------------
 
---- Toggles state of tabline.
-tabline.toggle = function ()
-	if  tabline.state.attached == true then
-		tabline.detach();
-	else
-		tabline.attach();
-	end
-end
-
---- Toggles tabline.
-tabline.Toggle = function ()
-	--- true -> false,
-	--- false -> true
-	tabline.state.enable = not tabline.state.enable;
-
-	tabline.toggle();
-end
-
-----------------------------------------------------------------------
-
 --- Enables *all* attached windows.
 tabline.Enable = function ()
 	tabline.state.enable = true;
@@ -317,6 +297,17 @@ end
 
 ----------------------------------------------------------------------
 
+--- Toggles tabline.
+tabline.Toggle = function ()
+	if tabline.state.enable == true then
+		tabline.Disable();
+	else
+		tabline.Enable();
+	end
+end
+
+----------------------------------------------------------------------
+
 --- Sets up the tabline module.
 ---@param config tabline.config | nil
 tabline.setup = function (config)

lua/bars/winbar.lua

@@ -826,33 +826,6 @@ end
 
 ----------------------------------------------------------------------
 
---- Toggles state of given window.
----@param window integer
-winbar.toggle = function (window)
-	if type(window) ~= "number" or winbar.state.attached_windows[window] == nil then
-		return;
-	elseif winbar.state.attached_windows[window] == true then
-		winbar.detach(window);
-	else
-		winbar.attach(window, true);
-	end
-end
-
---- Toggles winbar **globally**.
-winbar.Toggle = function ()
-	--- true -> false,
-	--- false -> true
-	winbar.state.enable = not winbar.state.enable;
-
-	for window, state in pairs(winbar.state.attached_windows) do
-		if state ~= nil then
-			winbar.toggle(window);
-		end
-	end
-end
-
-----------------------------------------------------------------------
-
 --- Enables winbar for `window`.
 ---@param window integer
 winbar.enable = function (window)
@@ -869,7 +842,7 @@ winbar.Enable = function ()
 
 	for window, state in pairs(winbar.state.attached_windows) do
 		if state ~= true then
-			winbar.attach(window);
+			winbar.enable(window);
 		end
 	end
 end
@@ -888,7 +861,7 @@ end
 winbar.Disable = function ()
 	for window, state in pairs(winbar.state.attached_windows) do
 		if state ~= false then
-			winbar.detach(window);
+			winbar.disable(window);
 		end
 	end
 
@@ -897,6 +870,29 @@ end
 
 ----------------------------------------------------------------------
 
+--- Toggles state of given window.
+---@param window integer
+winbar.toggle = function (window)
+	if type(window) ~= "number" or winbar.state.attached_windows[window] == nil then
+		return;
+	elseif winbar.state.attached_windows[window] == true then
+		winbar.disable(window);
+	else
+		winbar.enable(window);
+	end
+end
+
+--- Toggles winbar **globally**.
+winbar.Toggle = function ()
+	if winbar.state.enable == true then
+		winbar.Disable();
+	else
+		winbar.Enable();
+	end
+end
+
+----------------------------------------------------------------------
+
 --- Sets up the winbar module.
 ---@param config winbar.config | nil
 winbar.setup = function (config)