chizui/Il2CppInspectorRedux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

C#: Fix handling of scoped names pointing to global:: scope

Browse Source
This commit is contained in:
Katy Coe
2020-09-14 12:28:00 +02:00
parent 27b9b290da
commit ac17a3a510
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Il2CppInspector.Common/Reflection/TypeInfo.cs
View File

@@ -561,6 +561,10 @@ namespace Il2CppInspector.Reflection
minimallyScopedName = mutualRootScope.Length > 0 ? usedType.Substring(mutualRootScope.Length + 1) : "global::" + usedType; minimallyScopedName = mutualRootScope.Length > 0 ? usedType.Substring(mutualRootScope.Length + 1) : "global::" + usedType;
} }
// If the final name starts with ".", it's a reference to the global namespace (ie. unnamed root namespace)
if (minimallyScopedName.StartsWith("."))
minimallyScopedName = "global::" + minimallyScopedName.Substring(1);
return minimallyScopedName; return minimallyScopedName;
} }
@@ -873,6 +877,8 @@ namespace Il2CppInspector.Reflection
declaredEvents = new List<EventInfo>(); declaredEvents = new List<EventInfo>();
for (var e = Definition.eventStart; e < Definition.eventStart + Definition.event_count; e++) for (var e = Definition.eventStart; e < Definition.eventStart + Definition.event_count; e++)
declaredEvents.Add(new EventInfo(pkg, e, this)); declaredEvents.Add(new EventInfo(pkg, e, this));
// TODO: Events have the same edge case issue as properties above, eg. PoGo 0.35.0
} }
// Initialize a type from a concrete generic instance // Initialize a type from a concrete generic instance