Skip to content

Commit e2a3343

Browse files
committed
Misc cleanup and bug fixes
1 parent a840e90 commit e2a3343

File tree

3 files changed

+7
-22
lines changed

3 files changed

+7
-22
lines changed

Classes/ObjectExplorers/Sections/Shortcuts/FLEXViewControllerShortcuts.m

-19
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,10 @@
1313
#import "FLEXAlert.h"
1414

1515
@interface FLEXViewControllerShortcuts ()
16-
@property (nonatomic, readonly) UIViewController *viewController;
17-
@property (nonatomic, readonly) BOOL viewControllerIsInUse;
1816
@end
1917

2018
@implementation FLEXViewControllerShortcuts
2119

22-
#pragma mark - Internal
23-
24-
- (UIViewController *)viewController {
25-
return self.object;
26-
}
27-
28-
/// A view controller is "in use" if it's view is in a window,
29-
/// or if it belongs to a navigation stack which is in use.
30-
- (BOOL)viewControllerIsInUse {
31-
if (self.viewController.view.window) {
32-
return YES;
33-
}
34-
35-
return self.viewController.navigationController != nil;
36-
}
37-
38-
3920
#pragma mark - Overrides
4021

4122
+ (instancetype)forObject:(UIViewController *)viewController {

Classes/Utility/Categories/FLEXRuntime+UIKitHelpers.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ - (NSString *)reuseIdentifierWithTarget:(id)object { return nil; }
156156
if (targetNotNil) {
157157
id value = [self currentValueBeforeUnboxingWithTarget:object];
158158
[items addObjectsFromArray:@[
159-
@"Value Preview", [self previewWithTarget:object],
159+
@"Value Preview", [self previewWithTarget:object] ?: @"",
160160
@"Value Address", returnsObject ? [FLEXUtility addressOfObject:value] : @"",
161161
]];
162162
}
@@ -462,7 +462,7 @@ - (NSString *)reuseIdentifierWithTarget:(id)object { return nil; }
462462
NSString *conformances = [conformanceNames componentsJoinedByString:@"\n"];
463463
return @[
464464
@"Name", self.name ?: @"",
465-
@"Conformances", conformances,
465+
@"Conformances", conformances ?: @"",
466466
];
467467
}
468468

Classes/Utility/Runtime/Objc/FLEXObjcInternal.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ extern "C" {
5050
// originally _objc_isTaggedPointer //
5151
//////////////////////////////////////
5252
NS_INLINE BOOL flex_isTaggedPointer(const void *ptr) {
53-
return ((uintptr_t)ptr & _OBJC_TAG_MASK) == _OBJC_TAG_MASK;
53+
#if OBJC_HAVE_TAGGED_POINTERS
54+
return ((uintptr_t)ptr & _OBJC_TAG_MASK) == _OBJC_TAG_MASK;
55+
#else
56+
return NO;
57+
#endif
5458
}
5559

5660
#define FLEXIsTaggedPointer(obj) flex_isTaggedPointer((__bridge void *)obj)

0 commit comments

Comments
 (0)