Skip to content

Commit e6fd5ed

Browse files
committed
Fix bug in new FLEXMirror usage
1 parent d13f263 commit e6fd5ed

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

Classes/ObjectExplorers/FLEXObjectExplorer.m

+5-7
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,21 @@ - (id)initWithObject:(id)objectOrClass {
7272
return self;
7373
}
7474

75-
- (id<FLEXMirror>)initialMirror {
75+
- (id<FLEXMirror>)mirrorForClass:(Class)cls {
7676
static Class FLEXSwiftMirror = nil;
7777

78-
id obj = _object;
79-
8078
// Should we use Reflex?
81-
if (FLEXIsSwiftObjectOrClass(obj) && FLEXObjectExplorer.reflexAvailable) {
79+
if (FLEXIsSwiftObjectOrClass(cls) && FLEXObjectExplorer.reflexAvailable) {
8280
// Initialize FLEXSwiftMirror class if needed
8381
if (!FLEXSwiftMirror) {
8482
FLEXSwiftMirror = NSClassFromString(@"FLEXSwiftMirror");
8583
}
8684

87-
return [(id<FLEXMirror>)[FLEXSwiftMirror alloc] initWithSubject:obj];
85+
return [(id<FLEXMirror>)[FLEXSwiftMirror alloc] initWithSubject:cls];
8886
}
8987

9088
// No; not swift object, or Reflex unavailable
91-
return [FLEXMirror reflect:obj];
89+
return [FLEXMirror reflect:cls];
9290
}
9391

9492

@@ -178,9 +176,9 @@ - (void)reloadMetadata {
178176
Class superclass = nil;
179177
NSInteger count = self.classHierarchyClasses.count;
180178
NSInteger rootIdx = count - 1;
181-
id<FLEXMirror> mirror = self.initialMirror;
182179
for (NSInteger i = 0; i < count; i++) {
183180
Class cls = self.classHierarchyClasses[i];
181+
id<FLEXMirror> mirror = [self mirrorForClass:cls];
184182
superclass = (i < rootIdx) ? self.classHierarchyClasses[i+1] : nil;
185183

186184
[allProperties addObject:[self

0 commit comments

Comments
 (0)