Add class hierarchy back to object explorer screen

Classes/ObjectExplorers/FLEXObjectExplorer.h

@@ -43,9 +43,11 @@
 @property (nonatomic, readonly) NSArray<NSArray<FLEXMethod *> *> *allClassMethods;
 @property (nonatomic, readonly) NSArray<FLEXMethod *> *classMethods;
 
+@property (nonatomic, readonly) NSArray<Class> *classHierarchyClasses;
+@property (nonatomic, readonly) NSArray<FLEXStaticMetadata *> *classHierarchy;
+
 @property (nonatomic, readonly) NSArray<NSArray<FLEXProtocol *> *> *allConformedProtocols;
 @property (nonatomic, readonly) NSArray<FLEXProtocol *> *conformedProtocols;
-@property (nonatomic, readonly) NSArray<Class> *classHierarchy;
 
 @property (nonatomic, readonly) NSArray<FLEXStaticMetadata *> *allInstanceSizes;
 @property (nonatomic, readonly) FLEXStaticMetadata *instanceSize;

Classes/ObjectExplorers/FLEXObjectExplorer.m

@@ -99,11 +99,11 @@
     // Loop over each class and each superclass, collect
     // the fresh and unique metadata in each category
     Class superclass = nil;
-    NSInteger count = self.classHierarchy.count;
+    NSInteger count = self.classHierarchyClasses.count;
     NSInteger rootIdx = count - 1;
     for (NSInteger i = 0; i < count; i++) {
-        Class cls = self.classHierarchy[i];
-        superclass = (i < rootIdx) ? self.classHierarchy[i+1] : nil;
+        Class cls = self.classHierarchyClasses[i];
+        superclass = (i < rootIdx) ? self.classHierarchyClasses[i+1] : nil;
 
         [_allProperties addObject:[self
             metadataUniquedByName:[cls flex_allInstanceProperties]
@@ -135,6 +135,9 @@
             superclass:superclass
             kind:FLEXMetadataKindProtocols
         ]];
+        
+        // TODO: join instance size, image name, and class hierarchy into a single model object
+        // This would greatly reduce the laziness that has begun to manifest itself here
         [_allInstanceSizes addObject:[FLEXStaticMetadata
             style:FLEXStaticMetadataRowStyleKeyValue
             title:@"Instance Size" number:@(class_getInstanceSize(cls))
@@ -144,6 +147,8 @@
             title:@"Image Name" string:@(class_getImageName(cls))
         ]];
     }
+    
+    _classHierarchy = [FLEXStaticMetadata classHierarchy:self.classHierarchyClasses];
 
     // Set up UIKit helper data
     // Really, we only need to call this on properties and ivars
@@ -210,6 +215,7 @@
                     break;
 
                 case FLEXMetadataKindProtocols:
+                case FLEXMetadataKindClassHierarchy:
                 case FLEXMetadataKindOther:
                     return YES; // These types are already uniqued
                     break;
@@ -229,7 +235,7 @@
 - (void)reloadClassHierarchy {
     // The class hierarchy will never contain metaclass objects by this logic;
     // it is always the same for a given class and instances of it
-    _classHierarchy = [[self.object class] flex_classHierarchy];
+    _classHierarchyClasses = [[self.object class] flex_classHierarchy];
 }
 
 @end

Classes/ObjectExplorers/FLEXObjectExplorerViewController.m

@@ -110,7 +110,7 @@
 
     // Carousel scope bar
     [self.explorer reloadClassHierarchy];
-    self.carousel.items = [self.explorer.classHierarchy flex_mapped:^id(Class cls, NSUInteger idx) {
+    self.carousel.items = [self.explorer.classHierarchyClasses flex_mapped:^id(Class cls, NSUInteger idx) {
         return NSStringFromClass(cls);
     }];
     
@@ -192,9 +192,9 @@
         [FLEXMetadataSection explorer:self.explorer kind:FLEXMetadataKindIvars],
         [FLEXMetadataSection explorer:self.explorer kind:FLEXMetadataKindMethods],
         [FLEXMetadataSection explorer:self.explorer kind:FLEXMetadataKindClassMethods],
+        [FLEXMetadataSection explorer:self.explorer kind:FLEXMetadataKindClassHierarchy],
         [FLEXMetadataSection explorer:self.explorer kind:FLEXMetadataKindProtocols],
         [FLEXMetadataSection explorer:self.explorer kind:FLEXMetadataKindOther],
-//        [FLEXMetadataSection explorer:self.explorer kind:FLEXMetadataKindClassHierarchy],
         referencesSection
     ]];
 

Classes/ObjectExplorers/Sections/FLEXMetadataSection.h

@@ -15,6 +15,7 @@ typedef NS_ENUM(NSUInteger, FLEXMetadataKind) {
     FLEXMetadataKindIvars,
     FLEXMetadataKindMethods,
     FLEXMetadataKindClassMethods,
+    FLEXMetadataKindClassHierarchy,
     FLEXMetadataKindProtocols,
     FLEXMetadataKindOther
 };

Classes/ObjectExplorers/Sections/FLEXMetadataSection.m

@@ -90,6 +90,8 @@
             return [self titleWithBaseName:@"Methods"];
         case FLEXMetadataKindClassMethods:
             return [self titleWithBaseName:@"Class Methods"];
+        case FLEXMetadataKindClassHierarchy:
+            return [self titleWithBaseName:@"Class Hierarchy"];
         case FLEXMetadataKindProtocols:
             return [self titleWithBaseName:@"Protocols"];
         case FLEXMetadataKindOther:
@@ -133,6 +135,9 @@
         case FLEXMetadataKindProtocols:
             self.allMetadata = self.explorer.conformedProtocols;
             break;
+        case FLEXMetadataKindClassHierarchy:
+            self.allMetadata = self.explorer.classHierarchy;
+            break;
         case FLEXMetadataKindOther:
             self.allMetadata = @[self.explorer.instanceSize, self.explorer.imageName];
             break;

Classes/Utility/Categories/FLEXRuntime+UIKitHelpers.h

@@ -62,4 +62,6 @@ typedef NS_ENUM(NSUInteger, FLEXStaticMetadataRowStyle)
 + (instancetype)style:(FLEXStaticMetadataRowStyle)style title:(NSString *)title string:(NSString *)string;
 + (instancetype)style:(FLEXStaticMetadataRowStyle)style title:(NSString *)title number:(NSNumber *)number;
 
++ (NSArray<FLEXStaticMetadata *> *)classHierarchy:(NSArray<Class> *)classes;
+
 @end

Classes/Utility/Categories/FLEXRuntime+UIKitHelpers.m

@@ -14,7 +14,9 @@
 #import "FLEXFieldEditorViewController.h"
 #import "FLEXMethodCallingViewController.h"
 #import "FLEXTableView.h"
+#import "NSArray+Functional.h"
 
+#pragma mark FLEXProperty
 @implementation FLEXProperty (UIKitHelpers)
 
 /// Decide whether to use object or [object class] to get or set property
@@ -107,6 +109,7 @@
 @end
 
 
+#pragma mark FLEXIvar
 @implementation FLEXIvar (UIKitHelpers)
 
 - (BOOL)isEditable {
@@ -176,6 +179,7 @@
 @end
 
 
+#pragma mark FLEXMethod*
 @implementation FLEXMethodBase (UIKitHelpers)
 
 - (BOOL)isEditable {
@@ -245,6 +249,7 @@
 @end
 
 
+#pragma mark FLEXProtocol
 @implementation FLEXProtocol (UIKitHelpers)
 
 - (BOOL)isEditable {
@@ -280,16 +285,30 @@
 @end
 
 
-@interface FLEXStaticMetadata ()
-@property (nonatomic, readonly) FLEXTableViewCellReuseIdentifier reuse;
-@property (nonatomic, readonly) NSString *subtitle;
-@property (nonatomic, readonly) id metadata;
+#pragma mark FLEXStaticMetadata
+@interface FLEXStaticMetadata () {
+    @protected
+    NSString *_name;
+}
+@property (nonatomic) FLEXTableViewCellReuseIdentifier reuse;
+@property (nonatomic) NSString *subtitle;
+@property (nonatomic) id metadata;
+@end
+
+@interface FLEXStaticMetadata_Class : FLEXStaticMetadata
++ (instancetype)withClass:(Class)cls;
 @end
 
 @implementation FLEXStaticMetadata
 @synthesize name = _name;
 @synthesize tag = _tag;
 
++ (NSArray<FLEXStaticMetadata *> *)classHierarchy:(NSArray<Class> *)classes {
+    return [classes flex_mapped:^id(Class cls, NSUInteger idx) {
+        return [FLEXStaticMetadata_Class withClass:cls];
+    }];
+}
+
 + (instancetype)style:(FLEXStaticMetadataRowStyle)style title:(NSString *)title string:(NSString *)string {
     return [[self alloc] initWithStyle:style title:title subtitle:string];
 }
@@ -351,3 +370,32 @@
 }
 
 @end
+
+
+#pragma mark FLEXStaticMetadata_Class
+@implementation FLEXStaticMetadata_Class
+
++ (instancetype)withClass:(Class)cls {
+    NSParameterAssert(cls);
+    
+    FLEXStaticMetadata_Class *metadata = [self new];
+    metadata.metadata = cls;
+    metadata->_name = NSStringFromClass(cls);
+    metadata.reuse = kFLEXDefaultCell;
+    return metadata;
+}
+
+- (id)initWithStyle:(FLEXStaticMetadataRowStyle)style title:(NSString *)title subtitle:(NSString *)subtitle {
+    @throw NSInternalInconsistencyException;
+    return nil;
+}
+
+- (UIViewController *)viewerWithTarget:(id)object {
+    return [FLEXObjectExplorerFactory explorerViewControllerForObject:self.metadata];
+}
+
+- (UITableViewCellAccessoryType)suggestedAccessoryTypeWithTarget:(id)object {
+    return UITableViewCellAccessoryDisclosureIndicator;
+}
+
+@end