Fix #2640: Invalid implicit enum value for unordered items

(cherry picked from commit 1ee3384)
icsharpcode · Apr 3, 2022 · daa0b9c · daa0b9c
1 parent 732d82b
commit daa0b9c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/ICSharpCode.Decompiler.Tests/TestCases/Pretty/EnumTests.cs b/ICSharpCode.Decompiler.Tests/TestCases/Pretty/EnumTests.cs
@@ -28,6 +28,12 @@ public enum SimpleEnum
 			Item2
 		}
 
+		public enum OutOfOrderMembers
+		{
+			Item1 = 1,
+			Item0 = 0
+		}
+
 		public enum LongBasedEnum : long
 		{
 			Item1,

diff --git a/ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs b/ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs
@@ -1405,7 +1405,12 @@ EnumValueDisplayMode DetectBestEnumValueDisplayMode(ITypeDefinition typeDef, PEF
 					firstValue = currentValue;
 					first = false;
 				}
-				else if (!allConsecutive && !allPowersOfTwo)
+				else if (currentValue < previousValue)
+				{
+					// If the values are out of order, we fallback to displaying all values.
+					return EnumValueDisplayMode.All;
+				}
+				else if ((!allConsecutive && !allPowersOfTwo))
 				{
 					// We already know that the values are neither consecutive nor all powers of 2,
 					// so we can abort, and just display all values as-is.