Merge pull request #995 from facebook/pr/664

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

Author: appleguy

.travis.yml

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

AsyncDisplayKit-Prefix.gcda

@@ -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.h

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

AsyncDisplayKit/ASButtonNode.mm

@@ -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.h

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

AsyncDisplayKit/ASCellNode.m

@@ -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.h

@@ -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/ASCollectionNode.m

@@ -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.h

@@ -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"