From b4e589f7041b290deb4619874d33905b98ae1268 Mon Sep 17 00:00:00 2001 From: Katy Coe Date: Sat, 2 Nov 2019 18:33:02 +0100 Subject: [PATCH] Model: Additional tweaks to type name properties --- Il2CppInspector/Reflection/TypeInfo.cs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Il2CppInspector/Reflection/TypeInfo.cs b/Il2CppInspector/Reflection/TypeInfo.cs index afbb783..022808b 100644 --- a/Il2CppInspector/Reflection/TypeInfo.cs +++ b/Il2CppInspector/Reflection/TypeInfo.cs @@ -102,12 +102,11 @@ namespace Il2CppInspector.Reflection { public string FullName => IsGenericParameter? null : (IsPointer? "void *" : "") - + Namespace - + (Namespace.Length > 0? "." : "") - + (DeclaringType != null? DeclaringType.Name + "+" : "") + + (DeclaringType != null? DeclaringType.FullName + "+" : + Namespace + (Namespace.Length > 0? "." : "")) + base.Name - + (GenericTypeParameters != null ? "[" + string.Join(",", GenericTypeParameters.Select(x => x.Name)) + "]" : "") - + (GenericTypeArguments != null ? "[" + string.Join(",", GenericTypeArguments.Select(x => x.Name)) + "]" : "") + + (GenericTypeParameters != null ? "[" + string.Join(",", GenericTypeParameters.Select(x => x.FullName ?? x.Name)) + "]" : "") + + (GenericTypeArguments != null ? "[" + string.Join(",", GenericTypeArguments.Select(x => x.FullName ?? x.Name)) + "]" : "") + (IsArray? "[]" : ""); // TODO: Alot of other generics stuff @@ -413,6 +412,12 @@ namespace Il2CppInspector.Reflection { } // Display name of object - public override string ToString() => FullName?.Substring(FullName.LastIndexOf(".") + 1) ?? Name; + public override string ToString() => IsGenericParameter ? Name : + (IsPointer ? "void *" : "") + + (DeclaringType != null ? DeclaringType.Name + "+" : "") + + base.Name + + (GenericTypeParameters != null ? "[" + string.Join(",", GenericTypeParameters.Select(x => x.Namespace != Namespace? x.FullName ?? x.Name : x.ToString())) + "]" : "") + + (GenericTypeArguments != null ? "[" + string.Join(",", GenericTypeArguments.Select(x => x.Namespace != Namespace? x.FullName ?? x.Name : x.ToString())) + "]" : "") + + (IsArray ? "[]" : ""); } } \ No newline at end of file