Merge pull request #17 from Krealle/main

Add handling of secret values introduced in 12.0.0

Author: brittyazel

DevTool.lua

@@ -235,6 +235,16 @@ function DevTool:AddData(data, dataName)
 		return
 	end
 
+    if issecrettable(data) then
+		self:Print("Error: The data being added is a secret table. Aborting.")
+		return
+	end
+
+    if issecretvalue(data) then
+		self:Print("Error: The data being added is a secret value. Aborting.")
+		return
+	end
+
 	if not dataName then
 		dataName = tostring(data)
 	end
@@ -755,16 +765,17 @@ function DevTool:ProcessCallFunctionData(ok, info, parent, args, results)
 	-- for example 1, 2, nil, 4 should return only this 4 values nothing more, nothing less.
 	local found = false
 	for i = 10, 1, -1 do
-		if results[i] ~= nil then
+        local result = DevTool.normalizeSecretValue(results[i])
+		if result ~= nil then
 			found = true
 		end
 
 		if found or i == 1 then
 			-- if found some return or if return is nil
-			table.insert(elements, self:NewElement(results[i], string.format("  return: %d", i), indentation))
+			table.insert(elements, self:NewElement(result, string.format("  return: %d", i), indentation))
 
-			returnFormattedStr = string.format(" %s (%s)%s", tostring(results[i]),
-					self.colors.lightblue:WrapTextInColorCode(type(results[i])), returnFormattedStr)
+			returnFormattedStr = string.format(" %s (%s)%s", tostring(result),
+					self.colors.lightblue:WrapTextInColorCode(type(result)), returnFormattedStr)
 		end
 	end
 

DevTool.toc

@@ -1,4 +1,4 @@
-## Interface: 11507, 50500, 110200
+## Interface: 11507, 50500, 110200, 120000
 ## Title: DevTool
 ## Notes: A multipurpose tool to assist with addon development
 ## IconTexture: Interface\Icons\inv_misc_gear_08
@@ -26,4 +26,4 @@ Modules\FunctionLogger.lua
 Modules\History.lua
 
 XML\OptionsFrame.xml
-OptionsFrame.lua
+OptionsFrame.lua

Utilities/Utils.lua

@@ -10,6 +10,13 @@ local DevTool = addonTable.DevTool
 --- UTILS
 -----------------------------------------------------------------------------------------------
 
+function DevTool.normalizeSecretValue(value)
+    if issecrettable(value) or issecretvalue(value) then
+        return string.format("<SECRET %s>", type(value))
+    end
+    return value
+end
+
 --- Math
 
 function DevTool.round(num, idp)
@@ -165,6 +172,7 @@ end
 
 function DevTool.ToUIString(value, name, withoutLineBrakes)
 	local result
+    value = DevTool.normalizeSecretValue(value)
 	local valueType = type(value)
 
 	if valueType == "table" then
@@ -188,8 +196,9 @@ function DevTool.GetObjectInfoFromWoWAPI(helperText, value)
 	-- try to get frame name
 	if ok then
 		local concat = function(str, before, after)
-			before = before or ""
-			after = after or ""
+			before = DevTool.normalizeSecretValue(before) or ""
+			after = DevTool.normalizeSecretValue(after) or ""
+            str = DevTool.normalizeSecretValue(str)
 			if str then
 				return resultStr .. " " .. before .. str .. after
 			end
@@ -211,6 +220,8 @@ function DevTool.GetObjectInfoFromWoWAPI(helperText, value)
 					tostring(DevTool.round(height)) .. "]")
 		end
 
+        name = DevTool.normalizeSecretValue(name)
+
 		if helperText ~= name then
 			resultStr = concat(name, DevTool.colors.gray:WrapTextInColorCode("<"), DevTool.colors.gray:WrapTextInColorCode(">"))
 		end
@@ -284,4 +295,4 @@ function DevTool.GetParentTable(info)
 	end
 
 	return parent
-end
+end