From 7e4bf953b1dc2715932be92ceb1a5d870b0404b7 Mon Sep 17 00:00:00 2001 From: Michael Schneider Date: Mon, 6 Feb 2017 20:02:21 -0800 Subject: [PATCH] =?UTF-8?q?Move=20debugName=20into=20it=E2=80=99s=20own=20?= =?UTF-8?q?protocol=20out=20of=20the=20ASLayoutElement=20protocol=20(#2994?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsyncDisplayKit/ASDisplayNode.h | 3 ++- AsyncDisplayKit/Details/ASObjectDescriptionHelpers.h | 10 ++++++++++ AsyncDisplayKit/Layout/ASLayoutElement.h | 5 ----- AsyncDisplayKit/Layout/ASLayoutSpec.h | 3 ++- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/AsyncDisplayKit/ASDisplayNode.h b/AsyncDisplayKit/ASDisplayNode.h index 5313719336..4c9df39a01 100644 --- a/AsyncDisplayKit/ASDisplayNode.h +++ b/AsyncDisplayKit/ASDisplayNode.h @@ -16,6 +16,7 @@ #import #import #import +#import #import NS_ASSUME_NONNULL_BEGIN @@ -558,7 +559,7 @@ extern NSInteger const ASDefaultDrawingPriority; /** * Convenience methods for debugging. */ -@interface ASDisplayNode (Debugging) +@interface ASDisplayNode (Debugging) /** * @abstract Return a description of the node hierarchy. diff --git a/AsyncDisplayKit/Details/ASObjectDescriptionHelpers.h b/AsyncDisplayKit/Details/ASObjectDescriptionHelpers.h index 28c958169b..6731afed8e 100644 --- a/AsyncDisplayKit/Details/ASObjectDescriptionHelpers.h +++ b/AsyncDisplayKit/Details/ASObjectDescriptionHelpers.h @@ -11,6 +11,16 @@ NS_ASSUME_NONNULL_BEGIN +@protocol ASDebugNameProvider + +@required +/** + * @abstract Name that is printed by ascii art string and displayed in description. + */ +@property (nullable, nonatomic, copy) NSString *debugName; + +@end + /** * Your base class should conform to this and override `-debugDescription` * to call `[self propertiesForDebugDescription]` and use `ASObjectDescriptionMake` diff --git a/AsyncDisplayKit/Layout/ASLayoutElement.h b/AsyncDisplayKit/Layout/ASLayoutElement.h index 02cc5bc007..51b8af3261 100644 --- a/AsyncDisplayKit/Layout/ASLayoutElement.h +++ b/AsyncDisplayKit/Layout/ASLayoutElement.h @@ -89,11 +89,6 @@ ASDISPLAYNODE_EXTERN_C_END */ - (nullable NSArray> *)sublayoutElements; -/** - * @abstract Optional name that is printed by ascii art string and displayed in description. - */ -@property (nullable, nonatomic, copy) NSString *debugName; - #pragma mark - Calculate layout /** diff --git a/AsyncDisplayKit/Layout/ASLayoutSpec.h b/AsyncDisplayKit/Layout/ASLayoutSpec.h index 0badc01e45..54ca54531b 100644 --- a/AsyncDisplayKit/Layout/ASLayoutSpec.h +++ b/AsyncDisplayKit/Layout/ASLayoutSpec.h @@ -10,6 +10,7 @@ #import #import +#import NS_ASSUME_NONNULL_BEGIN @@ -91,7 +92,7 @@ NS_ASSUME_NONNULL_BEGIN @end -@interface ASLayoutSpec (Debugging) +@interface ASLayoutSpec (Debugging) /** * Used by other layout specs to create ascii art debug strings */