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

C#: Output DefaultMemberAttribute if the type doesn't have an indexer

Browse Source
This commit is contained in:
Katy Coe
2020-08-14 03:20:56 +02:00
parent f12d4bb98f
commit f08cfd573c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -406,6 +406,7 @@ namespace Il2CppInspector.Outputs
// Properties // Properties
sb.Clear(); sb.Clear();
var hasIndexer = false;
foreach (var prop in type.DeclaredProperties) { foreach (var prop in type.DeclaredProperties) {
// Attributes // Attributes
sb.Append(prop.CustomAttributes.OrderBy(a => a.AttributeType.Name) sb.Append(prop.CustomAttributes.OrderBy(a => a.AttributeType.Name)
@@ -435,6 +436,7 @@ namespace Il2CppInspector.Outputs
.Select(p => p.GetParameterString(scope, !SuppressMetadata, MustCompile))) + "] { "); .Select(p => p.GetParameterString(scope, !SuppressMetadata, MustCompile))) + "] { ");
getBody = " => default;"; getBody = " => default;";
setBody = " {}"; setBody = " {}";
hasIndexer = true;
} }
sb.Append((prop.CanRead? prop.GetMethod.CustomAttributes.Where(a => !MustCompile || a.AttributeType.FullName != CGAttribute) sb.Append((prop.CanRead? prop.GetMethod.CustomAttributes.Where(a => !MustCompile || a.AttributeType.FullName != CGAttribute)
@@ -554,9 +556,9 @@ namespace Il2CppInspector.Outputs
if (type.IsSerializable) if (type.IsSerializable)
sb.Append(prefix + "[Serializable]\n"); sb.Append(prefix + "[Serializable]\n");
// TODO: DefaultMemberAttribute should be output if it is present and the type does not have an indexer, otherwise suppressed // DefaultMemberAttribute should be output if it is present and the type does not have an indexer, otherwise suppressed
// See https://docs.microsoft.com/en-us/dotnet/api/system.reflection.defaultmemberattribute?view=netframework-4.8 // See https://docs.microsoft.com/en-us/dotnet/api/system.reflection.defaultmemberattribute?view=netframework-4.8
sb.Append(type.CustomAttributes.Where(a => a.AttributeType.FullName != DMAttribute && a.AttributeType.FullName != ExtAttribute) sb.Append(type.CustomAttributes.Where(a => (a.AttributeType.FullName != DMAttribute || !hasIndexer) && a.AttributeType.FullName != ExtAttribute)
.OrderBy(a => a.AttributeType.Name).ToString(scope, prefix, emitPointer: !SuppressMetadata, mustCompile: MustCompile)); .OrderBy(a => a.AttributeType.Name).ToString(scope, prefix, emitPointer: !SuppressMetadata, mustCompile: MustCompile));
// Roll-up multicast delegates to use the 'delegate' syntactic sugar // Roll-up multicast delegates to use the 'delegate' syntactic sugar