fix: correctly set nested type namespace

Clazex · Mar 8, 2023 · c6f5b99 · c6f5b99
1 parent db64df8
commit c6f5b99
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/HKReflect.Fody/Extensions.cs b/HKReflect.Fody/Extensions.cs
@@ -36,7 +36,7 @@ internal static void ParallelForEach<T>(this IEnumerable<T> self, Action<T> acti
 
 
 	internal static bool IsInNamespace(this TypeReference self, string ns) =>
-		self.Namespace == ns || self.Namespace.StartsWith(ns + '.');
+		self.DeclaringType?.IsInNamespace(ns) ?? (self.Namespace == ns || self.Namespace.StartsWith(ns + '.'));
 
 
 	internal static GenericInstanceMethod MakeGenericMethod(this MethodReference self, params TypeReference[] arguments) {

diff --git a/ReflectGen/InstanceClassGenerator.cs b/ReflectGen/InstanceClassGenerator.cs
@@ -27,7 +27,9 @@ Dictionary<TypeDefinition, string> typesToAddInheritance
 		}
 
 		Lazy<TypeDefinition> resTypeDef = new(() => new(
-			string.IsNullOrEmpty(typeDef.Namespace) ? baseNs : $"{baseNs}.{typeDef.Namespace}",
+			typeDef.IsNested
+				? string.Empty
+				: string.IsNullOrEmpty(typeDef.Namespace) ? baseNs : $"{baseNs}.{typeDef.Namespace}",
 			typeDef.Name,
 			(typeDef.Attributes & (~TypeAttributes.NestedFamORAssem))
 				| (typeDef.IsNested ? TypeAttributes.NestedPublic : TypeAttributes.Public)

diff --git a/ReflectGen/StaticClassGenerator.cs b/ReflectGen/StaticClassGenerator.cs
@@ -14,7 +14,9 @@ internal sealed partial class Program {
 		Dictionary<TypeDefinition, string> typesToAddInheritance
 	) {
 		Lazy<TypeDefinition> resTypeDef = new(() => new(
-			string.IsNullOrEmpty(typeDef.Namespace) ? baseNs + ".Static" : $"{baseNs}.Static.{typeDef.Namespace}",
+			typeDef.IsNested
+				? string.Empty
+				: string.IsNullOrEmpty(typeDef.Namespace) ? baseNs + ".Static" : $"{baseNs}.Static.{typeDef.Namespace}",
 			typeDef.Name + "R",
 			(typeDef.Attributes & (~TypeAttributes.NestedFamORAssem))
 				| (typeDef.IsNested ? TypeAttributes.NestedPublic : TypeAttributes.Public)