Changed nullable keyword to _Nullable and added a missing return

Jerome Boursier · Jerome Boursier · commit e662826e120d · 2021-09-02T11:34:53.000+02:00
diff --git a/Source/IGListKit/IGListBindingSectionController.m b/Source/IGListKit/IGListBindingSectionController.m
@@ -151,7 +151,7 @@ - (void)didUnhighlightItemAtIndex:(NSInteger)index {
 }
 
 #if !TARGET_OS_TV
-- (nullable UIContextMenuConfiguration *)contextMenuConfigurationForItemAtIndex:(NSInteger)index point:(CGPoint)point {
+- (UIContextMenuConfiguration * _Nullable)contextMenuConfigurationForItemAtIndex:(NSInteger)index point:(CGPoint)point {
     return [self.selectionDelegate sectionController:self contextMenuConfigurationForItemAtIndex:index point:point viewModel:self.viewModels[index]];
 }
 #endif
diff --git a/Source/IGListKit/IGListBindingSectionControllerSelectionDelegate.h b/Source/IGListKit/IGListBindingSectionControllerSelectionDelegate.h
@@ -71,10 +71,10 @@ didUnhighlightItemAtIndex:(NSInteger)index
  
  @return An object that conforms to `UIContextMenuConfiguration`.
  */
-- (nullable UIContextMenuConfiguration *)sectionController:(IGListBindingSectionController *)sectionController
-                    contextMenuConfigurationForItemAtIndex:(NSInteger)index
-                                                     point:(CGPoint)point
-                                                 viewModel:(id)viewModel API_AVAILABLE(ios(13.0)) API_UNAVAILABLE(tvos);
+- (UIContextMenuConfiguration * _Nullable)sectionController:(IGListBindingSectionController *)sectionController
+                     contextMenuConfigurationForItemAtIndex:(NSInteger)index
+                                                      point:(CGPoint)point
+                                                  viewModel:(id)viewModel API_AVAILABLE(ios(13.0)) API_UNAVAILABLE(tvos);
 
 @end
 
diff --git a/Source/IGListKit/IGListSectionController.h b/Source/IGListKit/IGListSectionController.h
@@ -121,7 +121,7 @@ NS_SWIFT_NAME(ListSectionController)
  
  @note The default implementation does nothing. **Calling super is not required.**
  */
-- (nullable UIContextMenuConfiguration *)contextMenuConfigurationForItemAtIndex:(NSInteger)index point:(CGPoint)point API_AVAILABLE(ios(13.0)) API_UNAVAILABLE(tvos);
+- (UIContextMenuConfiguration * _Nullable)contextMenuConfigurationForItemAtIndex:(NSInteger)index point:(CGPoint)point API_AVAILABLE(ios(13.0)) API_UNAVAILABLE(tvos);
 
 /**
  Identifies whether an object can be moved through interactive reordering.
diff --git a/Source/IGListKit/IGListSectionController.m b/Source/IGListKit/IGListSectionController.m
@@ -88,7 +88,7 @@ - (void)didHighlightItemAtIndex:(NSInteger)index {}
 
 - (void)didUnhighlightItemAtIndex:(NSInteger)index {}
 
-- (nullable UIContextMenuConfiguration *)contextMenuConfigurationForItemAtIndex:(NSInteger)index point:(CGPoint)point {
+- (UIContextMenuConfiguration * _Nullable)contextMenuConfigurationForItemAtIndex:(NSInteger)index point:(CGPoint)point {
   return nil;
 }
 
diff --git a/Source/IGListKit/Internal/IGListAdapter+UICollectionView.m b/Source/IGListKit/Internal/IGListAdapter+UICollectionView.m
@@ -240,7 +240,7 @@ - (UIContextMenuConfiguration *)collectionView:(UICollectionView *)collectionVie
   // forward this method to the delegate b/c this implementation will steal the message from the proxy
   id<UICollectionViewDelegate> collectionViewDelegate = self.collectionViewDelegate;
   if ([collectionViewDelegate respondsToSelector:@selector(collectionView:contextMenuConfigurationForItemAtIndexPath:point:)]) {
-      [collectionViewDelegate collectionView:collectionView contextMenuConfigurationForItemAtIndexPath:indexPath point:point];
+      return [collectionViewDelegate collectionView:collectionView contextMenuConfigurationForItemAtIndexPath:indexPath point:point];
   }
 
   IGListSectionController * sectionController = [self sectionControllerForSection:indexPath.section];
diff --git a/Tests/Objects/IGListTestSection.m b/Tests/Objects/IGListTestSection.m
@@ -60,7 +60,7 @@ - (void)didUnhighlightItemAtIndex:(NSInteger)index {
     self.wasUnhighlighted = YES;
 }
 
-- (nullable UIContextMenuConfiguration *)contextMenuConfigurationForItemAtIndex:(NSInteger)index point:(CGPoint)point {
+- (UIContextMenuConfiguration * _Nullable)contextMenuConfigurationForItemAtIndex:(NSInteger)index point:(CGPoint)point {
   self.requestedContextMenu = YES;
   return nil;
 }
diff --git a/Tests/Objects/IGTestBindingWithoutDeselectionDelegate.m b/Tests/Objects/IGTestBindingWithoutDeselectionDelegate.m
@@ -32,7 +32,7 @@ - (void)sectionController:(nonnull IGListBindingSectionController *)sectionContr
 }
 
 
-- (nullable UIContextMenuConfiguration *)sectionController:(nonnull IGListBindingSectionController *)sectionController
+- (UIContextMenuConfiguration * _Nullable)sectionController:(nonnull IGListBindingSectionController *)sectionController
                     contextMenuConfigurationForItemAtIndex:(NSInteger)index
                                                      point:(CGPoint)point
                                                  viewModel:(nonnull id)viewModel API_AVAILABLE(ios(13.0)) API_UNAVAILABLE(tvos) {
diff --git a/Tests/Objects/IGTestDiffingSectionController.m b/Tests/Objects/IGTestDiffingSectionController.m
@@ -65,7 +65,7 @@ - (void)sectionController:(IGListBindingSectionController *)sectionController di
     self.unhighlightedViewModel = viewModel;
 }
 
-- (nullable UIContextMenuConfiguration *)sectionController:(IGListBindingSectionController *)sectionController contextMenuConfigurationForItemAtIndex:(NSInteger)index point:(CGPoint)point viewModel:(id)viewModel API_AVAILABLE(ios(13.0)) API_UNAVAILABLE(tvos) {
+- (UIContextMenuConfiguration * _Nullable)sectionController:(IGListBindingSectionController *)sectionController contextMenuConfigurationForItemAtIndex:(NSInteger)index point:(CGPoint)point viewModel:(id)viewModel API_AVAILABLE(ios(13.0)) API_UNAVAILABLE(tvos) {
   self.contextMenuViewModel = viewModel;
   return nil;
 }

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ - (void)didUnhighlightItemAtIndex:(NSInteger)index {`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`#if !TARGET_OS_TV`
`154`		`-- (nullable UIContextMenuConfiguration *)contextMenuConfigurationForItemAtIndex:(NSInteger)index point:(CGPoint)point {`
	`154`	`+- (UIContextMenuConfiguration * _Nullable)contextMenuConfigurationForItemAtIndex:(NSInteger)index point:(CGPoint)point {`
`155`	`155`	`return [self.selectionDelegate sectionController:self contextMenuConfigurationForItemAtIndex:index point:point viewModel:self.viewModels[index]];`
`156`	`156`	`}`
`157`	`157`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ - (void)didHighlightItemAtIndex:(NSInteger)index {}`
`88`	`88`
`89`	`89`	`- (void)didUnhighlightItemAtIndex:(NSInteger)index {}`
`90`	`90`
`91`		`-- (nullable UIContextMenuConfiguration *)contextMenuConfigurationForItemAtIndex:(NSInteger)index point:(CGPoint)point {`
	`91`	`+- (UIContextMenuConfiguration * _Nullable)contextMenuConfigurationForItemAtIndex:(NSInteger)index point:(CGPoint)point {`
`92`	`92`	`return nil;`
`93`	`93`	`}`
`94`	`94`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ - (UIContextMenuConfiguration )collectionView:(UICollectionView )collectionVie`
`240`	`240`	`// forward this method to the delegate b/c this implementation will steal the message from the proxy`
`241`	`241`	`id<UICollectionViewDelegate> collectionViewDelegate = self.collectionViewDelegate;`
`242`	`242`	`if ([collectionViewDelegate respondsToSelector:@selector(collectionView:contextMenuConfigurationForItemAtIndexPath:point:)]) {`
`243`		`- [collectionViewDelegate collectionView:collectionView contextMenuConfigurationForItemAtIndexPath:indexPath point:point];`
	`243`	`+ return [collectionViewDelegate collectionView:collectionView contextMenuConfigurationForItemAtIndexPath:indexPath point:point];`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`IGListSectionController * sectionController = [self sectionControllerForSection:indexPath.section];`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ - (void)didUnhighlightItemAtIndex:(NSInteger)index {`
`60`	`60`	`self.wasUnhighlighted = YES;`
`61`	`61`	`}`
`62`	`62`
`63`		`-- (nullable UIContextMenuConfiguration *)contextMenuConfigurationForItemAtIndex:(NSInteger)index point:(CGPoint)point {`
	`63`	`+- (UIContextMenuConfiguration * _Nullable)contextMenuConfigurationForItemAtIndex:(NSInteger)index point:(CGPoint)point {`
`64`	`64`	`self.requestedContextMenu = YES;`
`65`	`65`	`return nil;`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ - (void)sectionController:(nonnull IGListBindingSectionController *)sectionContr`
`32`	`32`	`}`
`33`	`33`
`34`	`34`
`35`		`-- (nullable UIContextMenuConfiguration )sectionController:(nonnull IGListBindingSectionController )sectionController`
	`35`	`+- (UIContextMenuConfiguration * _Nullable)sectionController:(nonnull IGListBindingSectionController *)sectionController`
`36`	`36`	`contextMenuConfigurationForItemAtIndex:(NSInteger)index`
`37`	`37`	`point:(CGPoint)point`
`38`	`38`	`viewModel:(nonnull id)viewModel API_AVAILABLE(ios(13.0)) API_UNAVAILABLE(tvos) {`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ - (void)sectionController:(IGListBindingSectionController *)sectionController di`
`65`	`65`	`self.unhighlightedViewModel = viewModel;`
`66`	`66`	`}`
`67`	`67`
`68`		`-- (nullable UIContextMenuConfiguration )sectionController:(IGListBindingSectionController )sectionController contextMenuConfigurationForItemAtIndex:(NSInteger)index point:(CGPoint)point viewModel:(id)viewModel API_AVAILABLE(ios(13.0)) API_UNAVAILABLE(tvos) {`
	`68`	`+- (UIContextMenuConfiguration * _Nullable)sectionController:(IGListBindingSectionController *)sectionController contextMenuConfigurationForItemAtIndex:(NSInteger)index point:(CGPoint)point viewModel:(id)viewModel API_AVAILABLE(ios(13.0)) API_UNAVAILABLE(tvos) {`
`69`	`69`	`self.contextMenuViewModel = viewModel;`
`70`	`70`	`return nil;`
`71`	`71`	`}`