Enforce sorted values.

Author: KN4CK3R

ReClass.NET/Nodes/EnumNode.cs

@@ -87,13 +87,13 @@ private string GetStringRepresentation(long value)
 		{
 			if (!MetaData.UseFlagsMode)
 			{
-				var index = MetaData.Values.FindIndex(v => v == value);
+				var index = MetaData.Values.FindIndex(kv => kv.Key == value);
 				if (index == -1)
 				{
 					return value.ToString();
 				}
 
-				return MetaData.Names[index];
+				return MetaData.Values[index].Value;
 			}
 
 			return GetFlagsStringRepresentation(value);
@@ -103,19 +103,16 @@ private string GetFlagsStringRepresentation(long value)
 		{
 			var result = (ulong)value;
 
-			var names = MetaData.Names;
 			var values = MetaData.Values;
 
-			Contract.Assert(names.Count == values.Count);
-
 			var index = values.Count - 1;
 			var retval = new StringBuilder();
 			var firstTime = true;
 			var saveResult = result;
 
 			while (index >= 0)
 			{
-				var temp = (ulong)values[index];
+				var temp = (ulong)values[index].Key;
 				if (index == 0 && temp == 0)
 				{
 					break;
@@ -129,7 +126,7 @@ private string GetFlagsStringRepresentation(long value)
 						retval.Prepend(" | ");
 					}
 
-					retval.Prepend(names[index]);
+					retval.Prepend(values[index].Value);
 					firstTime = false;
 				}
 
@@ -143,9 +140,9 @@ private string GetFlagsStringRepresentation(long value)
 
 			if (saveResult == 0)
 			{
-				if (values.Count > 0 && values[0] == 0)
+				if (values.Count > 0 && values[0].Key == 0)
 				{
-					return names[0];
+					return values[0].Value;
 				}
 
 				return "0";

ReClass.NET/Project/EnumMetaData.cs

@@ -14,16 +14,16 @@ public class EnumMetaData
 
 		public int UnderlyingTypeSize { get; private set; } = sizeof(int);
 
-		public IReadOnlyList<long> Values { get; private set; }
+		public IReadOnlyList<KeyValuePair<long, string>> Values { get; private set; }
 
-		public IReadOnlyList<string> Names { get; private set; }
-
-		public void SetData(bool useFlagsMode, int underlyingTypeSize, IDictionary<long, string> values)
+		public void SetData(bool useFlagsMode, int underlyingTypeSize, IEnumerable<KeyValuePair<long, string>> values)
 		{
 			if (!(underlyingTypeSize == 1 || underlyingTypeSize == 2 || underlyingTypeSize == 4 || underlyingTypeSize == 8))
 			{
 				throw new ArgumentOutOfRangeException(nameof(underlyingTypeSize));
 			}
+			
+			var temp = values.OrderBy(t => t.Key).ToList();
 
 			if (useFlagsMode)
 			{
@@ -41,7 +41,7 @@ public void SetData(bool useFlagsMode, int underlyingTypeSize, IDictionary<long,
 						break;
 				}
 
-				if (values.Keys.Select(v => (ulong)v).Max() > maxPossibleValue)
+				if (temp.Select(kv => (ulong)kv.Key).Max() > maxPossibleValue)
 				{
 					throw new ArgumentOutOfRangeException();
 				}
@@ -66,15 +66,14 @@ public void SetData(bool useFlagsMode, int underlyingTypeSize, IDictionary<long,
 						break;
 				}
 
-				if (values.Keys.Max() > maxPossibleValue || values.Keys.Min() < minPossibleValue)
+				if (temp.Max(kv => kv.Key) > maxPossibleValue || temp.Min(kv => kv.Key) < minPossibleValue)
 				{
 					throw new ArgumentOutOfRangeException();
 				}
 			}
 
 			UseFlagsMode = useFlagsMode;
-			Values = values.Keys.ToList();
-			Names = values.Values.ToList();
+			Values = temp;
 		}
 	}
 }