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

C#: Reduce scope redundancies in type declarations

Browse Source
This commit is contained in:
Katy Coe
2020-02-24 12:05:33 +01:00
parent 39bd356d85
commit 6046f2493d
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Il2CppInspector.Common/Outputs/CSharpCodeStubs.cs
View File

@@ -557,15 +557,11 @@ namespace Il2CppInspector.Outputs
sb.Append(prefix + type.GetModifierString());
// Inheriting from a base class or implementing an interface using a generic type which contains a nested type parameter
// inside the declared class must be referenced from outside the scope of the type being defined
var outerScope = new Scope {Current = scope.Current.DeclaringType, Namespaces = scope.Namespaces};
var @base = type.ImplementedInterfaces.Select(x => x.GetScopedCSharpName(outerScope)).ToList();
var @base = type.ImplementedInterfaces.Select(x => x.GetScopedCSharpName(scope, isPartOfTypeDeclaration: true)).ToList();
if (type.BaseType != null && type.BaseType.FullName != "System.Object" && type.BaseType.FullName != "System.ValueType" && !type.IsEnum)
@base.Insert(0, type.BaseType.GetScopedCSharpName(outerScope));
@base.Insert(0, type.BaseType.GetScopedCSharpName(scope, isPartOfTypeDeclaration: true));
if (type.IsEnum && type.GetEnumUnderlyingType().FullName != "System.Int32") // enums derive from int by default
@base.Insert(0, type.GetEnumUnderlyingType().GetScopedCSharpName(outerScope));
@base.Insert(0, type.GetEnumUnderlyingType().GetScopedCSharpName(scope));
var baseText = @base.Count > 0 ? " : " + string.Join(", ", @base) : string.Empty;
sb.Append($"{type.CSharpTypeDeclarationName}{baseText}");

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

@@ -289,7 +289,7 @@ namespace Il2CppInspector.Reflection {
}
// C#-friendly type name as it should be used in the scope of a given type
public string GetScopedCSharpName(Scope usingScope = null, bool omitRef = false) {
public string GetScopedCSharpName(Scope usingScope = null, bool omitRef = false, bool isPartOfTypeDeclaration = false) {
// Unscoped name if no using scope specified
if (usingScope == null)
return CSharpName;
@@ -309,7 +309,13 @@ namespace Il2CppInspector.Reflection {
n = n?.Remove(n.IndexOf("`", StringComparison.Ordinal));
// Generic type parameters and type arguments
var g = string.Join(", ", getGenericTypeParameters(usingScope).Select(x => x.GetScopedCSharpName(usingScope)));
// Inheriting from a base class or implementing an interface use the type's declaring scope, not the type's scope itself
// for generic type parameters
var outerScope = usingScope;
if (isPartOfTypeDeclaration)
outerScope = new Scope {Current = usingScope.Current?.DeclaringType, Namespaces = usingScope.Namespaces};
var g = string.Join(", ", getGenericTypeParameters(usingScope).Select(x => x.GetScopedCSharpName(outerScope)));
if (!string.IsNullOrEmpty(g))
n += "<" + g + ">";