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

Model: Include the global namespace when checking for ambiguous type references

Browse Source
This commit is contained in:
Katy Coe
2019-11-29 02:33:47 +01:00
parent 74f209bc2e
commit 0fe5fa53a6
5 changed files with 608 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Il2CppInspector/Reflection/TypeInfo.cs
View File

@@ -281,7 +281,14 @@ namespace Il2CppInspector.Reflection {
// Only test the outermost type name
outerTypeName = minimallyScopedName.Split('.')[0];
// Take matching type names from all namespaces in scope
var matchingNamespaces = scope.Namespaces.Where(n => Assembly.Model.TypesByFullName.ContainsKey(n + "." + outerTypeName)).ToList();
// The global namespace is in scope so take every matching type from that too
if (Assembly.Model.TypesByFullName.ContainsKey(outerTypeName))
matchingNamespaces.Add("");
// More than one possible matching type? If so, the type reference is ambiguous
if (matchingNamespaces.Count > 1) {
Debug.WriteLine("Minimally scoped name would be ambiguous between: " + string.Join(" and ", matchingNamespaces.Select(n => n + "." + minimallyScopedName)));
// TODO: This can be improved to cut off a new mutual root that doesn't cause ambiguity