Replace strsplit with directly setting tables, fixes #284

Author: Snakybo

Clicked/Core/CommandProcessor.lua

@@ -55,8 +55,7 @@ local function EnsureMacroFrameHandler()
 	macroFrameHandler:Hide()
 
 	-- set required data first
-	macroFrameHandler:SetAttribute("clicked-keybinds", "")
-	macroFrameHandler:SetAttribute("clicked-identifiers", "")
+	Addon:SetupRestrictedEnvironmentVariables(macroFrameHandler, {})
 
 	-- register OnShow and OnHide handlers to ensure bindings are registered
 	macroFrameHandler:SetAttribute("_onshow", [[
@@ -90,33 +89,19 @@ local function EnsureMacroFrameHandler()
 			return
 		end
 
-		local keybinds = self:GetAttribute("clicked-keybinds")
-		local identifiers = self:GetAttribute("clicked-identifiers")
+		for i = 1, table.maxn(keybinds) do
+			local keybind = keybinds[i]
+			local identifier = identifiers[i]
 
-		if strlen(keybinds) > 0 then
-			keybinds = table.new(strsplit("\001", keybinds))
-			identifiers = table.new(strsplit("\001", identifiers))
-
-			for i = 1, table.maxn(keybinds) do
-				local keybind = keybinds[i]
-				local identifier = identifiers[i]
-
-				self:SetBindingClick(true, keybind, self, identifier)
-			end
+			self:SetBindingClick(true, keybind, self, identifier)
 		end
 	]])
 
 	-- unregister a binding
 	macroFrameHandler:SetAttribute("clicked-clear-bindings", [[
-		local keybinds = self:GetAttribute("clicked-keybinds")
-
-		if strlen(keybinds) > 0 then
-			keybinds = table.new(strsplit("\001", keybinds))
-
-			for i = 1, table.maxn(keybinds) do
-				local keybind = keybinds[i]
-				self:ClearBinding(keybind)
-			end
+		for i = 1, table.maxn(keybinds) do
+			local keybind = keybinds[i]
+			self:ClearBinding(keybind)
 		end
 	]])
 
@@ -140,19 +125,7 @@ end
 --- @param keybinds Keybind[]
 --- @param attributes string[]
 function Addon:UpdateMacroFrameHandler(keybinds, attributes)
-	local split = {
-		keybinds = {},
-		identifiers = {}
-	}
-
-	for _, keybind in ipairs(keybinds) do
-		table.insert(split.keybinds, keybind.key)
-		table.insert(split.identifiers, keybind.identifier)
-	end
-
-	macroFrameHandler:SetAttribute("clicked-keybinds", table.concat(split.keybinds, "\001"))
-	macroFrameHandler:SetAttribute("clicked-identifiers", table.concat(split.identifiers, "\001"))
-
+	Addon:SetupRestrictedEnvironmentVariables(macroFrameHandler, keybinds)
 	Addon:SetPendingFrameAttributes(macroFrameHandler, attributes)
 	Addon:ApplyAttributesToFrame(macroFrameHandler)
 end

Clicked/Core/Utils.lua

@@ -1426,3 +1426,35 @@ function Addon:CharAt(str, index)
 
 	return string.sub(str, index, index)
 end
+
+--- Set the `keybinds` and `identifiers` variables within the restricted environment of the frame.
+---
+--- @param frame Frame
+--- @param keybinds Keybind[]
+function Addon:SetupRestrictedEnvironmentVariables(frame, keybinds)
+	local keys = {}
+	local identifiers = {}
+
+	for _, keybind in ipairs(keybinds) do
+		table.insert(keys, keybind.key)
+		table.insert(identifiers, keybind.identifier)
+	end
+
+	--- @type string
+	local command
+
+	if #keybinds == 0 then
+		command = [[
+			keybinds = table.new()
+			identifiers = table.new()
+		]]
+	else
+		command = string.format([[
+			keybinds = table.new('%s')
+			identifiers = table.new('%s')
+		]], table.concat(keys, ", "), table.concat(identifiers, ", "))
+	end
+
+	--- @diagnostic disable-next-line: undefined-field
+	frame:Execute(command)
+end

Clicked/UnitFrames/ClickCastHeader.lua

@@ -44,8 +44,7 @@ function Addon:RegisterClickCastHeader()
 	ClickCastHeader = CreateFrame("Frame", "ClickCastHeader", UIParent, "SecureHandlerBaseTemplate,SecureHandlerAttributeTemplate")
 	Addon.ClickCastHeader = ClickCastHeader
 
-	ClickCastHeader:SetAttribute("clicked-keybinds", "")
-	ClickCastHeader:SetAttribute("clicked-identifiers", "")
+	Addon:SetupRestrictedEnvironmentVariables(ClickCastHeader, {})
 
 	ClickCastHeader:SetAttribute("setup-keybinds", [[
 		if currentClickcastButton ~= nil then
@@ -54,33 +53,20 @@ function Addon:RegisterClickCastHeader()
 
 		currentClickcastButton = self
 
-		local keybinds = control:GetAttribute("clicked-keybinds")
-		local identifiers = control:GetAttribute("clicked-identifiers")
 		local button = self:GetAttribute("clicked-sidecar") or self
 
-		if strlen(keybinds) > 0 then
-			keybinds = table.new(strsplit("\001", keybinds))
-			identifiers = table.new(strsplit("\001", identifiers))
+		for i = 1, table.maxn(keybinds) do
+			local keybind = keybinds[i]
+			local identifier = identifiers[i]
 
-			for i = 1, table.maxn(keybinds) do
-				local keybind = keybinds[i]
-				local identifier = identifiers[i]
-
-				self:SetBindingClick(true, keybind, button, identifier)
-			end
+			self:SetBindingClick(true, keybind, button, identifier)
 		end
 	]])
 
 	ClickCastHeader:SetAttribute("clear-keybinds", [[
-		local keybinds = control:GetAttribute("clicked-keybinds")
-
-		if strlen(keybinds) > 0 then
-			keybinds = table.new(strsplit("\001", keybinds))
-
-			for i = 1, table.maxn(keybinds) do
-				local keybind = keybinds[i]
-				self:ClearBinding(keybind)
-			end
+		for i = 1, table.maxn(keybinds) do
+			local keybind = keybinds[i]
+			self:ClearBinding(keybind)
 		end
 
 		currentClickcastButton = nil
@@ -164,18 +150,7 @@ function Addon:UpdateClickCastHeader(keybinds)
 		return
 	end
 
-	local split = {
-		keybinds = {},
-		identifiers = {}
-	}
-
-	for _, keybind in ipairs(keybinds) do
-		table.insert(split.keybinds, keybind.key)
-		table.insert(split.identifiers, keybind.identifier)
-	end
-
-	Addon.ClickCastHeader:SetAttribute("clicked-keybinds", table.concat(split.keybinds, "\001"))
-	Addon.ClickCastHeader:SetAttribute("clicked-identifiers", table.concat(split.identifiers, "\001"))
+	Addon:SetupRestrictedEnvironmentVariables(Addon.ClickCastHeader, keybinds)
 
 	Addon.ClickCastHeader:Execute([[
 		local button = currentClickcastButton