Misc cleanup and bug fixes

fix
FLEXTool · May 25, 2020 · 5212824 · 5212824
1 parent a840e90
commit 5212824
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 22 deletions.
diff --git a/Classes/ObjectExplorers/Sections/Shortcuts/FLEXViewControllerShortcuts.m b/Classes/ObjectExplorers/Sections/Shortcuts/FLEXViewControllerShortcuts.m
@@ -13,29 +13,10 @@
 #import "FLEXAlert.h"
 
 @interface FLEXViewControllerShortcuts ()
-@property (nonatomic, readonly) UIViewController *viewController;
-@property (nonatomic, readonly) BOOL viewControllerIsInUse;
 @end
 
 @implementation FLEXViewControllerShortcuts
 
-#pragma mark - Internal
-
-- (UIViewController *)viewController {
-    return self.object;
-}
-
-/// A view controller is "in use" if it's view is in a window,
-/// or if it belongs to a navigation stack which is in use.
-- (BOOL)viewControllerIsInUse {
-    if (self.viewController.view.window) {
-        return YES;
-    }
-
-    return self.viewController.navigationController != nil;
-}
-
-
 #pragma mark - Overrides
 
 + (instancetype)forObject:(UIViewController *)viewController {

diff --git a/Classes/Utility/Categories/FLEXRuntime+UIKitHelpers.m b/Classes/Utility/Categories/FLEXRuntime+UIKitHelpers.m
@@ -156,7 +156,7 @@ - (NSString *)reuseIdentifierWithTarget:(id)object { return nil; }
     if (targetNotNil) {
         id value = [self currentValueBeforeUnboxingWithTarget:object];
         [items addObjectsFromArray:@[
-            @"Value Preview",         [self previewWithTarget:object],
+            @"Value Preview",         [self previewWithTarget:object] ?: @"",
             @"Value Address",         returnsObject ? [FLEXUtility addressOfObject:value] : @"",
         ]];
     }
@@ -462,7 +462,7 @@ - (NSString *)reuseIdentifierWithTarget:(id)object { return nil; }
     NSString *conformances = [conformanceNames componentsJoinedByString:@"\n"];
     return @[
         @"Name",         self.name ?: @"",
-        @"Conformances", conformances,
+        @"Conformances", conformances ?: @"",
     ];
 }
 

diff --git a/Classes/Utility/Runtime/Objc/FLEXObjcInternal.h b/Classes/Utility/Runtime/Objc/FLEXObjcInternal.h
@@ -50,7 +50,11 @@ extern "C" {
 // originally _objc_isTaggedPointer //
 //////////////////////////////////////
 NS_INLINE BOOL flex_isTaggedPointer(const void *ptr)  {
-    return ((uintptr_t)ptr & _OBJC_TAG_MASK) == _OBJC_TAG_MASK;
+    #if OBJC_HAVE_TAGGED_POINTERS
+        return ((uintptr_t)ptr & _OBJC_TAG_MASK) == _OBJC_TAG_MASK;
+    #else
+        return NO;
+    #endif
 }
 
 #define FLEXIsTaggedPointer(obj) flex_isTaggedPointer((__bridge void *)obj)