Small tweaks to the CreateTypedefs pass: (#68)

BepInEx · Dec 22, 2022 · 384d4ea · 384d4ea
1 parent d984c57
commit 384d4ea
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Il2CppInterop.Generator/Passes/Pass10CreateTypedefs.cs b/Il2CppInterop.Generator/Passes/Pass10CreateTypedefs.cs
@@ -13,8 +13,10 @@ public static void DoPass(RewriteGlobalContext context)
     {
         foreach (var assemblyContext in context.Assemblies)
             foreach (var type in assemblyContext.OriginalAssembly.MainModule.Types)
-                if (type.Namespace != "Cpp2ILInjected" && type.Name != "<Module>")
+                if (!IsCpp2ILInjectedType(type) && type.Name != "<Module>")
                     ProcessType(type, assemblyContext, null);
+
+        static bool IsCpp2ILInjectedType(TypeDefinition type) => type.Namespace?.StartsWith("Cpp2ILInjected", StringComparison.Ordinal) ?? false;
     }
 
     private static void ProcessType(TypeDefinition type, AssemblyRewriteContext assemblyContext,
@@ -47,7 +49,7 @@ private static void ProcessType(TypeDefinition type, AssemblyRewriteContext asse
 
         static string GetNamespace(TypeDefinition type, AssemblyRewriteContext assemblyContext)
         {
-            if (type.Name is "<Module>" or "<PrivateImplementationDetails>" || type.DeclaringType is not null)
+            if (type.Name is "<Module>" || type.DeclaringType is not null)
                 return type.Namespace;
             else
                 return type.Namespace.UnSystemify(assemblyContext.GlobalContext.Options);