Merge branch 'ImGuiMod_consolidate'

Author: mellinoe

src/CodeGenerator/ImguiDefinitions.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System.Xml.Linq;
 
 namespace CodeGenerator
 {
@@ -228,21 +229,35 @@ class EnumDefinition
     {
         private readonly Dictionary<string, string> _sanitizedNames;
 
-        public string Name { get; }
-        public string FriendlyName { get; }
+        public string[] Names { get; }
+        public string[] FriendlyNames { get; }
         public EnumMember[] Members { get; }
 
         public EnumDefinition(string name, EnumMember[] elements)
         {
-            Name = name;
-            if (Name.EndsWith('_'))
+            if (TypeInfo.AlternateEnumPrefixes.TryGetValue(name, out string altName))
             {
-                FriendlyName = Name.Substring(0, Name.Length - 1);
+                Names = new[] { name, altName };
             }
             else
             {
-                FriendlyName = Name;
+                Names = new[] { name };
+            }
+            FriendlyNames = new string[Names.Length];
+            for (int i = 0; i < Names.Length; i++)
+            {
+                string n = Names[i];
+                if (n.EndsWith('_'))
+                {
+                    FriendlyNames[i] = n.Substring(0, n.Length - 1);
+                }
+                else
+                {
+                    FriendlyNames[i] = n;
+                }
+
             }
+
             Members = elements;
 
             _sanitizedNames = new Dictionary<string, string>();
@@ -265,12 +280,31 @@ public string SanitizeNames(string text)
         private string SanitizeMemberName(string memberName)
         {
             string ret = memberName;
-            if (memberName.StartsWith(Name))
+            bool altSubstitution = false;
+
+            // Try alternate substitution first
+            foreach (KeyValuePair<string, string> substitutionPair in TypeInfo.AlternateEnumPrefixSubstitutions)
             {
-                ret = memberName.Substring(Name.Length);
-                if (ret.StartsWith("_"))
+                if (memberName.StartsWith(substitutionPair.Key))
                 {
-                    ret = ret.Substring(1);
+                    ret = ret.Replace(substitutionPair.Key, substitutionPair.Value);
+                    altSubstitution = true;
+                    break;
+                }
+            }
+
+            if (!altSubstitution)
+            {
+                foreach (string name in Names)
+                {
+                    if (memberName.StartsWith(name))
+                    {
+                        ret = memberName.Substring(name.Length);
+                        if (ret.StartsWith("_"))
+                        {
+                            ret = ret.Substring(1);
+                        }
+                    }
                 }
             }
 
@@ -279,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;
@@ -375,7 +409,7 @@ public TypeReference(string name, string type, int asize, string templateType, E
 
             TypeVariants = typeVariants;
 
-            IsEnum = enums.Any(t => t.Name == type || t.FriendlyName == type || TypeInfo.WellKnownEnums.Contains(type));
+            IsEnum = enums.Any(t => t.Names.Contains(type) || t.FriendlyNames.Contains(type) || TypeInfo.WellKnownEnums.Contains(type));
         }
 
         private int ParseSizeString(string sizePart, EnumDefinition[] enums)
@@ -394,7 +428,7 @@ private int ParseSizeString(string sizePart, EnumDefinition[] enums)
             {
                 foreach (EnumDefinition ed in enums)
                 {
-                    if (sizePart.StartsWith(ed.Name))
+                    if (ed.Names.Any(n => sizePart.StartsWith(n)))
                     {
                         foreach (EnumMember member in ed.Members)
                         {

src/CodeGenerator/Program.cs

@@ -84,14 +84,14 @@ static void Main(string[] args)
 
             foreach (EnumDefinition ed in defs.Enums)
             {
-                using (CSharpCodeWriter writer = new CSharpCodeWriter(Path.Combine(outputPath, ed.FriendlyName + ".gen.cs")))
+                using (CSharpCodeWriter writer = new CSharpCodeWriter(Path.Combine(outputPath, ed.FriendlyNames[0] + ".gen.cs")))
                 {
                     writer.PushBlock($"namespace {projectNamespace}");
-                    if (ed.FriendlyName.Contains("Flags"))
+                    if (ed.FriendlyNames[0].Contains("Flags"))
                     {
                         writer.WriteLine("[System.Flags]");
                     }
-                    writer.PushBlock($"public enum {ed.FriendlyName}");
+                    writer.PushBlock($"public enum {ed.FriendlyNames[0]}");
                     foreach (EnumMember member in ed.Members)
                     {
                         string sanitizedName = ed.SanitizeNames(member.Name);

src/CodeGenerator/TypeInfo.cs

@@ -62,7 +62,17 @@ public class TypeInfo
         {
             "ImGuiMouseButton"
         };
-        
+
+        public static readonly Dictionary<string, string> AlternateEnumPrefixes = new Dictionary<string, string>()
+        {
+            { "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,
-        ImGuiMod_None = 0,
-        ImGuiMod_Ctrl = 4096,
-        ImGuiMod_Shift = 8192,
-        ImGuiMod_Alt = 16384,
-        ImGuiMod_Super = 32768,
-        ImGuiMod_Mask = 61440,
-        ImGuiMod_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,

src/ImGui.NET/ImGui.NET.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>A .NET wrapper for the Dear ImGui library.</Description>
-    <AssemblyVersion>1.89.1</AssemblyVersion>
+    <AssemblyVersion>1.89.2</AssemblyVersion>
     <Authors>Eric Mellino</Authors>
     <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>