Fixed enum table strings and sorting

Author: Ketho

Annotations/Core/Data/Enum.lua

@@ -9810,6 +9810,10 @@ Constants = {
 		DEFAULT_AUCTION_PRICE_MULTIPLIER = 1.5,
 	},
 	CAAConstants = {
+		CAASayCombatEndDefault = true,
+		CAATargetNameDefault = true,
+		CAASayCombatStartDefault = true,
+		CAAEnabledDefault = false,
 		CAAFrequencyMin = -10,
 		CAAFrequencyDefault = 0,
 		CAAInterruptCastDefault = 0,
@@ -9821,12 +9825,10 @@ Constants = {
 		CAAPlayerResourcePercentDefault = 0,
 		CAATargetCastFormatDefault = 0,
 		CAATargetCastModeDefault = 0,
-		CAAEnabledDefault = false,
 		CAATargetDeathBehaviorDefault = 0,
 		CAAThrottleDefault = 0,
 		CAAThrottleMin = 0,
 		CAAVoiceDefault = 0,
-		CAATargetNameDefault = true,
 		CAAMinCastTimeStep = 0.5,
 		CAAThrottleStep = 0.5,
 		CAAPlayerHealthFormatDefault = 1,
@@ -9840,8 +9842,6 @@ Constants = {
 		CAAMinCastTimeMax = 5,
 		CAAThrottleMax = 5,
 		CAAFrequencyMax = 10,
-		CAASayCombatEndDefault = true,
-		CAASayCombatStartDefault = true,
 	},
 	CalendarGetEventTypeConstants = {
 		DEFAULT_CALENDAR_GET_EVENT_TYPE = 0,
@@ -9850,8 +9850,8 @@ Constants = {
 		MaxCallings = 3,
 	},
 	CatalogShopVirtualCurrencyConstants = {
-		HEARTHSTEEL_VC_CURRENCY_CODE = XVV,
-		TRADERS_TENDER_VC_CURRENCY_CODE = XWP,
+		HEARTHSTEEL_VC_CURRENCY_CODE = "XVV",
+		TRADERS_TENDER_VC_CURRENCY_CODE = "XWP",
 	},
 	CharCustomizationConstants = {
 		NUM_CUSTOM_DISPLAY = 4,

luasrc/annotate/literals.lua

@@ -42,14 +42,18 @@ local function SortByValue(tbl)
 		table.insert(t, {key=key, value=value})
 	end
 	table.sort(t, function(a, b)
-		if a.value ~= b.value then
-			if type(a.value) == "boolean" or type(b.value) == "boolean" then
-				return a and not b
+		if type(a.value) == type(b.value) then
+			if type(a.value) == "boolean" then
+				return a.value and not b.value
 			else
-				return a.value < b.value
+				if a.value == b.value then
+					return a.key < b.key
+				else
+					return a.value < b.value
+				end
 			end
 		else
-			return a.key < b.key
+			return type(a.value) < type(b.value)
 		end
 	end)
 	return t
@@ -72,6 +76,16 @@ local function IsBitEnum(tbl, name)
 	return true
 end
 
+-- sort a table with numbers, strings and booleans as value
+local function SortEnum(a, b)
+	local typeA, typeB = type(a), type(b)
+	if typeA == typeB then
+		return a < b
+	else
+		return a < b
+	end
+end
+
 function m:GetEnumTable()
 	Util:DownloadAndRun(
 		string.format("https://raw.githubusercontent.com/Ketho/BlizzardInterfaceResources/%s/Resources/LuaEnum.lua", BLIZZRES_BRANCH),
@@ -100,7 +114,11 @@ function m:GetEnumTable()
 	for _, name in pairs(Util:SortTable(Constants)) do
 		table.insert(t, string.format("\t%s = {", name))
 		for _, constTbl in pairs(SortByValue(Constants[name])) do
-			table.insert(t, string.format("\t\t%s = %s,", constTbl.key, constTbl.value))
+			if type(constTbl.value) == "string" then
+				table.insert(t, string.format('\t\t%s = "%s",', constTbl.key, constTbl.value))
+			else
+				table.insert(t, string.format("\t\t%s = %s,", constTbl.key, constTbl.value))
+			end
 		end
 		table.insert(t, "\t},")
 	end