Updates

Author: Mx-Iris

ClassDumpRuntime/Models/CDGenerationOptions.h

@@ -53,6 +53,8 @@ NS_REFINED_FOR_SWIFT
 
 @property (nonatomic) BOOL addIvarOffsetComments;
 
+@property (nonatomic) BOOL expandIvarRecordTypeMembers;
+
 @end
 
 NS_HEADER_AUDIT_END(nullability)

ClassDumpRuntime/Models/CDGenerationOptions.m

@@ -20,6 +20,7 @@ - (id)copyWithZone:(NSZone *)zone {
     options.stripDtorMethod = _stripDtorMethod;
     options.addSymbolImageComments = _addSymbolImageComments;
     options.addIvarOffsetComments = _addIvarOffsetComments;
+    options.expandIvarRecordTypeMembers = _expandIvarRecordTypeMembers;
     return options;
 }
 

ClassDumpRuntime/Models/Reflections/CDClassModel.m

@@ -256,7 +256,7 @@ - (CDSemanticString *)semanticLinesWithOptions:(CDGenerationOptions *)options {
                 [build appendString:@"\n" semanticType:CDSemanticTypeStandard];
             }
             [build appendString:@"    " semanticType:CDSemanticTypeStandard];
-            [build appendSemanticString:[ivar semanticString]];
+            [build appendSemanticString:[ivar semanticStringWithOptions:options]];
             [build appendString:@";" semanticType:CDSemanticTypeStandard];
             if (options.addIvarOffsetComments) {
                 [build appendString:[NSString stringWithFormat:@" // offset: %"PRIdPTR"", ivar.offset] semanticType:CDSemanticTypeComment];

ClassDumpRuntime/Models/Reflections/CDIvarModel.h

@@ -10,7 +10,7 @@
 #import <objc/runtime.h>
 
 #import <ClassDumpRuntime/CDParseType.h>
-
+#import <ClassDumpRuntime/CDGenerationOptions.h>
 NS_HEADER_AUDIT_BEGIN(nullability)
 
 @interface CDIvarModel : NSObject
@@ -26,7 +26,7 @@ NS_HEADER_AUDIT_BEGIN(nullability)
 - (instancetype)initWithIvar:(Ivar)ivar;
 + (instancetype)modelWithIvar:(Ivar)ivar;
 
-- (CDSemanticString *)semanticString;
+- (CDSemanticString *)semanticStringWithOptions:(CDGenerationOptions *)options;
 
 @end
 

ClassDumpRuntime/Models/Reflections/CDIvarModel.m

@@ -21,16 +21,16 @@ - (instancetype)initWithIvar:(Ivar)ivar {
         _name = @(ivar_getName(ivar));
         _type = [CDTypeParser typeForEncoding:(ivar_getTypeEncoding(ivar) ?: "")];
         _offset = ivar_getOffset(ivar);
-        if ([_type isKindOfClass:[CDRecordType class]]) {
-            CDRecordType *recordType = (CDRecordType *)_type;
-            recordType.indentLevel = 1;
-            recordType.expand = YES;
-        }
     }
     return self;
 }
 
-- (CDSemanticString *)semanticString {
+- (CDSemanticString *)semanticStringWithOptions:(CDGenerationOptions *)options {
+    if ([self.type isKindOfClass:[CDRecordType class]] && options.expandIvarRecordTypeMembers) {
+        CDRecordType *recordType = (CDRecordType *)self.type;
+        recordType.indentLevel = 1;
+        recordType.expand = YES;
+    }
     return [self.type semanticStringForVariableName:self.name];
 }
 

ClassDumpRuntime/Models/Reflections/CDPropertyModel.m

@@ -101,7 +101,7 @@ - (instancetype)initWithProperty:(objc_property_t)property isClass:(BOOL)isClass
                     attributeName = @"copy";
                     break;
                 case '&':
-                    attributeName = @"retain";
+                    attributeName = @"strong";
                     break;
                 case 'D':
                     isDynamic = YES;