Additional logic to preserve ImGuiKey.ModXYZ naming.

Author: mellinoe

src/CodeGenerator/ImguiDefinitions.cs

@@ -280,14 +280,30 @@ public string SanitizeNames(string text)
         private string SanitizeMemberName(string memberName)
         {
             string ret = memberName;
-            foreach (string name in Names)
+            bool altSubstitution = false;
+
+            // Try alternate substitution first
+            foreach (KeyValuePair<string, string> substitutionPair in TypeInfo.AlternateEnumPrefixSubstitutions)
+            {
+                if (memberName.StartsWith(substitutionPair.Key))
+                {
+                    ret = ret.Replace(substitutionPair.Key, substitutionPair.Value);
+                    altSubstitution = true;
+                    break;
+                }
+            }
+
+            if (!altSubstitution)
             {
-                if (memberName.StartsWith(name))
+                foreach (string name in Names)
                 {
-                    ret = memberName.Substring(name.Length);
-                    if (ret.StartsWith("_"))
+                    if (memberName.StartsWith(name))
                     {
-                        ret = ret.Substring(1);
+                        ret = memberName.Substring(name.Length);
+                        if (ret.StartsWith("_"))
+                        {
+                            ret = ret.Substring(1);
+                        }
                     }
                 }
             }
@@ -297,7 +313,7 @@ private string SanitizeMemberName(string memberName)
                 ret = ret.Substring(0, ret.Length - 1);
             }
 
-            if (Char.IsDigit(ret.First()))
+            if (char.IsDigit(ret.First()))
                 ret = "_" + ret;
 
             return ret;

src/CodeGenerator/TypeInfo.cs

@@ -67,7 +67,12 @@ public class TypeInfo
         {
             { "ImGuiKey", "ImGuiMod" },
         };
-        
+
+        public static readonly Dictionary<string, string> AlternateEnumPrefixSubstitutions = new Dictionary<string, string>()
+        {
+            { "ImGuiMod_", "Mod" },
+        };
+
         public static readonly Dictionary<string, string> WellKnownFieldReplacements = new Dictionary<string, string>()
         {
             { "bool", "bool" }, // Force bool to remain as bool in type-safe wrappers.

src/ImGui.NET/Generated/ImGuiKey.gen.cs

@@ -144,13 +144,13 @@ public enum ImGuiKey
         ReservedForModAlt = 650,
         ReservedForModSuper = 651,
         COUNT = 652,
-        None = 0,
-        Ctrl = 4096,
-        Shift = 8192,
-        Alt = 16384,
-        Super = 32768,
-        Mask = 61440,
-        Shortcut = 4096,
+        ModNone = 0,
+        ModCtrl = 4096,
+        ModShift = 8192,
+        ModAlt = 16384,
+        ModSuper = 32768,
+        ModMask = 61440,
+        ModShortcut = 4096,
         NamedKey_BEGIN = 512,
         NamedKey_END = 652,
         NamedKey_COUNT = 140,