[Refactoring] Adopt Objective-C Nullability, Lightweight Generics Annotations

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7
+osx_image: xcode7.2
 before_install:
   - brew update
   - brew reinstall xctool

AsyncDisplayKit/ASButtonNode.h

@@ -6,7 +6,8 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <AsyncDisplayKit/AsyncDisplayKit.h>
+#import <AsyncDisplayKit/ASTextNode.h>
+#import <AsyncDisplayKit/ASImageNode.h>
 
 typedef enum : NSUInteger {
   ASButtonStateNormal,

AsyncDisplayKit/ASButtonNode.mm

@@ -7,8 +7,9 @@
  */
 
 #import "ASButtonNode.h"
-
-#import <AsyncDisplayKit/ASThread.h>
+#import "ASStackLayoutSpec.h"
+#import "ASThread.h"
+#import "ASDisplayNode+Subclasses.h"
 
 @interface ASButtonNode ()
 {

AsyncDisplayKit/ASCellNode.h

@@ -8,6 +8,8 @@
 
 #import <AsyncDisplayKit/ASDisplayNode.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @class ASCellNode;
 
 typedef NSUInteger ASCellNodeAnimation;
@@ -77,10 +79,10 @@ typedef NSUInteger ASCellNodeAnimation;
  * ASCellNode must forward touch events in order for UITableView and UICollectionView tap handling to work. Overriding
  * these methods (e.g. for highlighting) requires the super method be called.
  */
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER;
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER;
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER;
-- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER;
+- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER;
+- (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER;
+- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER;
+- (void)touchesCancelled:(nullable NSSet<UITouch *> *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER;
 
 /**
  * Marks the node as needing layout. Convenience for use whether the view / layer is loaded or not.
@@ -119,3 +121,5 @@ typedef NSUInteger ASCellNodeAnimation;
 @property (nonatomic, copy) NSString *text;
 
 @end
+
+NS_ASSUME_NONNULL_END

AsyncDisplayKit/ASCellNode.m

@@ -167,7 +167,8 @@ - (instancetype)init
 {
   if (!(self = [super init]))
     return nil;
-
+
+  _text = @"";
   _textNode = [[ASTextNode alloc] init];
   [self addSubnode:_textNode];
 

AsyncDisplayKit/ASCollectionNode.h

@@ -8,6 +8,8 @@
 
 #import <AsyncDisplayKit/ASCollectionView.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 /**
  * ASCollectionNode is a node based class that wraps an ASCollectionView. It can be used
  * as a subnode of another node, and provide room for many (great) features and improvements later on.
@@ -67,3 +69,5 @@
 - (void)reloadDataImmediately;
 
 @end
+
+NS_ASSUME_NONNULL_END

AsyncDisplayKit/ASCollectionNode.m

@@ -30,7 +30,8 @@ @implementation ASCollectionNode
 - (instancetype)init
 {
   ASDISPLAYNODE_NOT_DESIGNATED_INITIALIZER();
-  self = [self initWithCollectionViewLayout:nil]; // Will throw an exception for lacking a UICV Layout.
+  UICollectionViewLayout *nilLayout = nil;
+  self = [self initWithCollectionViewLayout:nilLayout]; // Will throw an exception for lacking a UICV Layout.
   return nil;
 }
 

AsyncDisplayKit/ASCollectionView.h

@@ -19,6 +19,8 @@
 @protocol ASCollectionDelegate;
 @protocol ASCollectionViewLayoutInspecting;
 
+NS_ASSUME_NONNULL_BEGIN
+
 /**
  * Node-based collection view.
  *
@@ -87,7 +89,7 @@
  *                    Boolean parameter that contains the value YES if all of the related animations completed successfully or 
  *                    NO if they were interrupted. This parameter may be nil. If supplied, the block is run on the main thread.
  */
-- (void)performBatchAnimated:(BOOL)animated updates:(void (^)())updates completion:(void (^)(BOOL))completion;
+- (void)performBatchAnimated:(BOOL)animated updates:(void (^ _Nullable)())updates completion:(void (^ _Nullable)(BOOL))completion;
 
 /**
  *  Perform a batch of updates asynchronously.  This method must be called from the main thread.
@@ -98,7 +100,7 @@
  *                    Boolean parameter that contains the value YES if all of the related animations completed successfully or
  *                    NO if they were interrupted. This parameter may be nil. If supplied, the block is run on the main thread.
  */
-- (void)performBatchUpdates:(void (^)())updates completion:(void (^)(BOOL))completion;
+- (void)performBatchUpdates:(void (^ _Nullable)())updates completion:(void (^ _Nullable)(BOOL))completion;
 
 /**
  * Reload everything from scratch, destroying the working range and all cached nodes.
@@ -107,7 +109,7 @@
  * the main thread.
  * @warning This method is substantially more expensive than UICollectionView's version.
  */
-- (void)reloadDataWithCompletion:(void (^)())completion;
+- (void)reloadDataWithCompletion:(void (^ _Nullable)())completion;
 
 /**
  * Reload everything from scratch, destroying the working range and all cached nodes.
@@ -186,7 +188,7 @@
  * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
  * before this method is called.
  */
-- (void)insertItemsAtIndexPaths:(NSArray *)indexPaths;
+- (void)insertItemsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths;
 
 /**
  * Deletes the items specified by an array of index paths.
@@ -196,7 +198,7 @@
  * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
  * before this method is called.
  */
-- (void)deleteItemsAtIndexPaths:(NSArray *)indexPaths;
+- (void)deleteItemsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths;
 
 /**
  * Reloads the specified items.
@@ -206,7 +208,7 @@
  * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
  * before this method is called.
  */
-- (void)reloadItemsAtIndexPaths:(NSArray *)indexPaths;
+- (void)reloadItemsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths;
 
 /**
  * Moves the item at a specified location to a destination location.
@@ -243,7 +245,7 @@
  *
  * @returns an array containing the nodes being displayed on screen.
  */
-- (NSArray *)visibleNodes;
+- (NSArray<ASCellNode *> *)visibleNodes;
 
 /**
  * Query the sized node at `indexPath` for its calculatedSize.
@@ -354,7 +356,7 @@
 @optional
 
 - (void)collectionView:(ASCollectionView *)collectionView willDisplayNodeForItemAtIndexPath:(NSIndexPath *)indexPath;
-- (void)collectionView:(ASCollectionView *)collectionView didEndDisplayingNodeForItemAtIndexPath:(NSIndexPath*)indexPath;
+- (void)collectionView:(ASCollectionView *)collectionView didEndDisplayingNodeForItemAtIndexPath:(NSIndexPath *)indexPath;
 
 /**
  * Receive a message that the collectionView is near the end of its data set and more data should be fetched if 
@@ -423,3 +425,5 @@
 - (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout asyncDataFetching:(BOOL)asyncDataFetchingEnabled ASDISPLAYNODE_DEPRECATED;
 
 @end
+
+NS_ASSUME_NONNULL_END

AsyncDisplayKit/ASCollectionView.mm

@@ -9,7 +9,6 @@
 #import "ASAssert.h"
 #import "ASBatchFetching.h"
 #import "ASDelegateProxy.h"
-#import "ASCollectionView.h"
 #import "ASCollectionNode.h"
 #import "ASCollectionDataController.h"
 #import "ASCollectionViewLayoutController.h"

AsyncDisplayKit/ASCollectionViewProtocols.h

@@ -6,6 +6,8 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
+NS_ASSUME_NONNULL_BEGIN
+
 /**
  * This is a subset of UICollectionViewDataSource.
  *
@@ -50,7 +52,9 @@
 - (void)collectionView:(UICollectionView *)collectionView didDeselectItemAtIndexPath:(NSIndexPath *)indexPath;
 
 - (BOOL)collectionView:(UICollectionView *)collectionView shouldShowMenuForItemAtIndexPath:(NSIndexPath *)indexPath;
-- (BOOL)collectionView:(UICollectionView *)collectionView canPerformAction:(SEL)action forItemAtIndexPath:(NSIndexPath *)indexPath withSender:(id)sender;
-- (void)collectionView:(UICollectionView *)collectionView performAction:(SEL)action forItemAtIndexPath:(NSIndexPath *)indexPath withSender:(id)sender;
+- (BOOL)collectionView:(UICollectionView *)collectionView canPerformAction:(SEL)action forItemAtIndexPath:(NSIndexPath *)indexPath withSender:(nullable id)sender;
+- (void)collectionView:(UICollectionView *)collectionView performAction:(SEL)action forItemAtIndexPath:(NSIndexPath *)indexPath withSender:(nullable id)sender;
 
 @end
+
+NS_ASSUME_NONNULL_END

AsyncDisplayKit/ASControlNode+Subclasses.h

@@ -6,8 +6,9 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <AsyncDisplayKit/ASControlNode.h>
+#import "ASControlNode.h"
 
+NS_ASSUME_NONNULL_BEGIN
 
 /**
  * The subclass header _ASControlNode+Subclasses_ defines methods to be
@@ -24,40 +25,42 @@
  @param touchEvent An event object encapsulating the information specific to the user event.
  @discussion ASControlNode implements this method to send all action messages associated with controlEvents. The list of targets is constructed from prior invocations of addTarget:action:forControlEvents:.
  */
-- (void)sendActionsForControlEvents:(ASControlNodeEvent)controlEvents withEvent:(UIEvent *)touchEvent;
+- (void)sendActionsForControlEvents:(ASControlNodeEvent)controlEvents withEvent:(nullable UIEvent *)touchEvent;
 
 /**
  @abstract Sent to the control when tracking begins.
  @param touch The touch on the receiving control.
  @param touchEvent An event object encapsulating the information specific to the user event.
  @result YES if the receiver should respond continuously (respond when touch is dragged); NO otherwise.
  */
-- (BOOL)beginTrackingWithTouch:(UITouch *)touch withEvent:(UIEvent *)touchEvent;
+- (BOOL)beginTrackingWithTouch:(UITouch *)touch withEvent:(nullable UIEvent *)touchEvent;
 
 /**
  @abstract Sent continuously to the control as it tracks a touch within the control's bounds.
  @param touch The touch on the receiving control.
  @param touchEvent An event object encapsulating the information specific to the user event.
  @result YES if touch tracking should continue; NO otherwise.
  */
-- (BOOL)continueTrackingWithTouch:(UITouch *)touch withEvent:(UIEvent *)touchEvent;
+- (BOOL)continueTrackingWithTouch:(UITouch *)touch withEvent:(nullable UIEvent *)touchEvent;
 
 /**
  @abstract Sent to the control when tracking should be cancelled.
  @param touchEvent An event object encapsulating the information specific to the user event. This parameter may be nil, indicating that the cancelation was caused by something other than an event, such as the display node being removed from its supernode.
  */
-- (void)cancelTrackingWithEvent:(UIEvent *)touchEvent;
+- (void)cancelTrackingWithEvent:(nullable UIEvent *)touchEvent;
 
 /**
  @abstract Sent to the control when the last touch completely ends, telling it to stop tracking.
  @param touch The touch that ended.
  @param touchEvent An event object encapsulating the information specific to the user event.
  */
-- (void)endTrackingWithTouch:(UITouch *)touch withEvent:(UIEvent *)touchEvent;
+- (void)endTrackingWithTouch:(nullable UITouch *)touch withEvent:(nullable UIEvent *)touchEvent;
 
 /**
  @abstract Settable version of highlighted property.
  */
 @property (nonatomic, readwrite, assign, getter=isHighlighted) BOOL highlighted;
 
 @end
+
+NS_ASSUME_NONNULL_END

AsyncDisplayKit/ASControlNode.h

@@ -8,6 +8,7 @@
 
 #import <AsyncDisplayKit/ASDisplayNode.h>
 
+NS_ASSUME_NONNULL_BEGIN
 
 /**
   @abstract Kinds of events possible for control nodes.
@@ -75,15 +76,15 @@ typedef NS_OPTIONS(NSUInteger, ASControlNodeEvent)
   @param controlEvents A bitmask specifying the control events for which the action message is sent. May not be 0. See "Control Events" for bitmask constants.
   @discussion You may call this method multiple times, and you may specify multiple target-action pairs for a particular event. Targets are held weakly.
  */
-- (void)addTarget:(id)target action:(SEL)action forControlEvents:(ASControlNodeEvent)controlEvents;
+- (void)addTarget:(nullable id)target action:(SEL)action forControlEvents:(ASControlNodeEvent)controlEvents;
 
 /**
   @abstract Returns the actions that are associated with a target and a particular control event.
   @param target The target object. May not be nil.
   @param controlEvent A single constant of type ASControlNodeEvent that specifies a particular user action on the control; for a list of these constants, see "Control Events". May not be 0 or ASControlNodeEventAllEvents.
   @result An array of selector names as NSString objects, or nil if there are no action selectors associated with controlEvent.
  */
-- (NSArray *)actionsForTarget:(id)target forControlEvent:(ASControlNodeEvent)controlEvent;
+- (nullable NSArray<NSString *> *)actionsForTarget:(id)target forControlEvent:(ASControlNodeEvent)controlEvent;
 
 /**
   @abstract Returns all target objects associated with the receiver.
@@ -97,13 +98,15 @@ typedef NS_OPTIONS(NSUInteger, ASControlNodeEvent)
   @param action A selector identifying an action message. Pass NULL to remove all action messages paired with target.
   @param controlEvents A bitmask specifying the control events associated with target and action. See "Control Events" for bitmask constants. May not be 0.
  */
-- (void)removeTarget:(id)target action:(SEL)action forControlEvents:(ASControlNodeEvent)controlEvents;
+- (void)removeTarget:(nullable id)target action:(nullable SEL)action forControlEvents:(ASControlNodeEvent)controlEvents;
 
 /**
   @abstract Sends the actions for the control events for a particular event.
   @param controlEvents A bitmask specifying the control events for which to send actions. See "Control Events" for bitmask constants. May not be 0.
   @param event The event which triggered these control actions. May be nil.
  */
-- (void)sendActionsForControlEvents:(ASControlNodeEvent)controlEvents withEvent:(UIEvent *)event;
+- (void)sendActionsForControlEvents:(ASControlNodeEvent)controlEvents withEvent:(nullable UIEvent *)event;
 
 @end
+
+NS_ASSUME_NONNULL_END