rrfactor: Rewrote parts of the tabline module

Author: OXY2DEV

lua/bars.lua

@@ -9,17 +9,17 @@ bars.config = {
 	statuscolumn = true,
 	statusline = true,
 	tabline = true,
-	-- winbar = function ()
-	-- 	if not _G.is_within_termux then
-	-- 		--- The function doesn't
-	-- 		--- exist.
-	-- 		return true;
-	-- 	else
-	-- 		--- Winbar should be disabled
-	-- 		--- while inside Termux.
-	-- 		return _G.is_within_termux() == false;
-	-- 	end
-	-- end,
+	winbar = function ()
+		if not _G.is_within_termux then
+			--- The function doesn't
+			--- exist.
+			return true;
+		else
+			--- Winbar should be disabled
+			--- while inside Termux.
+			return _G.is_within_termux() == false;
+		end
+	end,
 
 	---|fE
 };

lua/bars/tabline.lua

@@ -123,40 +123,13 @@ tabline.state = {
 	attached = false
 };
 
---- Updates the configuration ID for the tabline.
----@return string | nil
-tabline.update_id = function ()
-	---|fS
-
-	local keys = vim.tbl_keys(tabline.config);
-	local ignore = { "default" };
-	table.sort(keys);
-
-	local ID = "default";
-
-	for _, key in ipairs(keys) do
-		if vim.list_contains(ignore, key) then
-			goto continue;
-		elseif type(tabline.config[key]) ~= "table" then
-			goto continue;
-		end
-
-		---@type tabline.opts
-		local tmp = tabline.config[key];
-
-		if tmp.condition == true then
-			ID = key;
-		elseif pcall(tmp.condition --[[ @as fun():boolean ]]) and tmp.condition() == true  then
-			ID = key;
-		end
-
-		::continue::
+tabline.check_condition = function ()
+	if not tabline.config.condition then
+		return true;
 	end
 
-	vim.g.__tlID = ID;
-	tabline.state.attached = true;
-
-	---|fE
+	local can_call, cond = pcall(tabline.config.condition);
+	return can_call and cond;
 end
 
 --- Renders the tabline.
@@ -166,23 +139,21 @@ tabline.render = function ()
 
 	local components = require("bars.components.tabline");
 
-	if tabline.state.attached ~= true then
+	if tabline.check_condition() == false then
+		tabline.detach();
 		return "";
 	end
 
-	local tlID = vim.g.__tlID;
-
-	if not tlID then
-		return "";
-	end
+	tabline.update_id();
 
+	local tlID = vim.g.__tlID or "default";
 	local config = tabline.config[tlID];
 
 	if type(config) ~= "table" then
 		return "";
 	end
 
-	local _o = "%#Normal#";
+	local _o = "";
 
 	for _, component in ipairs(config.components or {}) do
 		_o = _o .. components.get(component.kind, component, _o);
@@ -193,119 +164,76 @@ tabline.render = function ()
 	---|fE
 end
 
-tabline.can_detach = function ()
-	if not tabline.config.condition then
-		return false;
-	end
-
-	local checked_condition, result = pcall(tabline.config.condition);
-
-	if checked_condition == false then
-		return false;
-	elseif result == false then
-		return true;
-	end
-end
-
-tabline.detach = function ()
+--- Attaches the tabline module.
+tabline.start = function ()
 	---|fS
 
-	vim.schedule(function ()
-		tabline.state.attached = false;
-
-		--- Cached tabline.
-		---@type string | nil
-		local _tl = vim.g.__tabline or "";
-
-		if _tl == "" or _tl == nil then
-			--- Reset tabline.
-			vim.cmd("set tabline&");
-		else
-			vim.api.nvim_set_option_value(
-				"tabline",
-				_tl,
-				{
-					scope = "global"
-				}
-			);
-		end
+	if tabline.state.enable == false then
+		return;
+	end
 
-		vim.g.__tlID = nil;
-		vim.g.__tabline = nil;
-	end);
+	vim.api.nvim_set_option_value("tabline", TBL, { scope = "global" })
 
 	---|fE
 end
 
-tabline.can_attach = function ()
-	if tabline.state.enable ~= true then
-		return false;
-	elseif tabline.state.attached == true then
-		return false;
-	elseif tabline.config.condition == nil then
-		return true;
-	end
-
-	local checked_condition, result = pcall(tabline.config.condition);
+tabline.stop = function ()
+	local _tabline = vim.api.nvim_get_option_value("tabline", { scope = "global" });
 
-	if checked_condition == false then
-		return true;
-	elseif result == false then
-		return false;
+	if _tabline ~= TBL and _tabline ~= "" then
+		return;
 	end
+
+	vim.api.nvim_set_option_value(
+		"tabline",
+		vim.g.__tabline or "",
+		{
+			scope = "global"
+		}
+	);
 end
 
---- Attaches the tabline module.
-tabline.attach = function ()
+--- Updates the configuration ID for {window}.
+tabline.update_id = function ()
 	---|fS
 
-	if tabline.can_attach() == false then
-		return;
-	end
-
-	tabline.update_id();
-
-	vim.g.__tabline = vim.o.tabline == TBL and "" or vim.o.tabline;
-	vim.o.tabline = TBL;
+	---@type string[]
+	local keys = vim.tbl_keys(tabline.config);
+	---@type string[]
+	local ignore = { "default" };
+	table.sort(keys);
 
-	---|fE
-end
+	local ID = "default";
 
---- Cleans up invalid buffers and recalculates
---- valid buffers config ID.
-tabline.clean = function ()
-	vim.schedule(function ()
-		if tabline.can_detach() then
-			tabline.detach();
+	for _, key in ipairs(keys) do
+		if vim.list_contains(ignore, key) then
+			goto continue;
+		elseif type(tabline.config[key]) ~= "table" then
+			goto continue;
 		end
-	end);
-end
 
-----------------------------------------------------------------------
+		local tmp = tabline.config[key];
 
---- Enables *all* attached windows.
-tabline.Enable = function ()
-	tabline.state.enable = true;
+		if tmp.condition == true then
+			ID = key;
+		elseif type(tmp.condition) == "function" then
+			---@diagnostic disable-next-line
+			local can_eval, val = pcall(tmp.condition, buffer, window);
 
-	tabline.attach();
-end
+			if can_eval and val then
+				ID = key;
+			end
+		end
 
---- Disables *all* attached windows.
-tabline.Disable = function ()
-	tabline.detach();
+		---@diagnostic enable:undefined-field
 
-	tabline.state.enable = false;
-end
+		::continue::
+	end
 
-----------------------------------------------------------------------
+	vim.g.__tlID = ID;
+	tabline.state.attached = true;
 
---- Toggles tabline.
-tabline.Toggle = function ()
-	if tabline.state.enable == true then
-		tabline.Disable();
-	else
-		tabline.Enable();
-	end
+	---|fE
 end
 
 ----------------------------------------------------------------------