Fixed renaming when items of an enum only differ by case.

Signed-off-by: Dimitar Dobrev <[email protected]>

Author: ddobrev

src/Generator/Passes/RenamePass.cs

@@ -364,9 +364,12 @@ static string ConvertCaseString(Declaration decl, RenameCasePattern pattern)
 
             for (int i = sb.Length - 1; i >= 0; i--)
             {
-                // ensure separation by not ending up with more capitals or digits in a row than before
-                if (sb[i] != '_' || (i > 0 && (char.IsUpper(sb[i - 1]) ||
-                    (i < sb.Length - 1 && char.IsDigit(sb[i + 1]) && char.IsDigit(sb[i - 1])))))
+                if (sb[i] != '_' ||
+                    // lower case intentional if the first character is already upper case
+                    (i + 1 < sb.Length && char.IsLower(sb[i + 1]) && char.IsUpper(sb[0])) ||
+                    // don't end up with more capitals or digits in a row than before
+                    (i > 0 && (char.IsUpper(sb[i - 1]) ||
+                     (i < sb.Length - 1 && char.IsDigit(sb[i + 1]) && char.IsDigit(sb[i - 1])))))
                     continue;
 
                 if (i < sb.Length - 1)

tests/Common/Common.Tests.cs

@@ -44,6 +44,9 @@ public void TestCodeGeneration()
         e = EnumWithUnderscores.CAPITALS_More;
         e = EnumWithUnderscores.UsesDigits1_0;
         e.GetHashCode();
+        ItemsDifferByCase itemsDifferByCase = ItemsDifferByCase.Case_a;
+        itemsDifferByCase = ItemsDifferByCase.CaseA;
+        itemsDifferByCase.GetHashCode();
         Common.SMallFollowedByCapital();
         using (new DerivedFromSecondaryBaseWithIgnoredVirtualMethod()) { }
 

tests/Common/Common.h

@@ -1427,3 +1427,9 @@ namespace hasUnnamedDecl
     {
     }
 }
+
+enum ItemsDifferByCase
+{
+    Case_a,
+    Case_A
+};