More __kindof macro fixes!

Author: asciimike

FirebaseUI/API/FirebaseCollectionViewDataSource.h

@@ -102,8 +102,8 @@
  * datasource.
  */
 @property(strong, nonatomic, __NON_NULL) void (^populateCell)
-    (__KINDOF(UICollectionViewCell *) __NON_NULL_PTR cell,
-     __KINDOF(NSObject *) __NON_NULL_PTR object);
+    (__KINDOF(UICollectionViewCell) __NON_NULL_PTR cell,
+     __KINDOF(NSObject) __NON_NULL_PTR object);
 
 /**
  * Initialize an instance of FirebaseCollectionViewDataSource that populates
@@ -271,10 +271,8 @@
  * subclass) and the
  * corresponding object to populate the cell with.
  */
-// clang-format off
 - (void)populateCellWithBlock:
-    (__NON_NULL void (^)(__KINDOF(UICollectionViewCell *) __NON_NULL_PTR cell,
-                         __KINDOF(NSObject *) __NON_NULL_PTR object))callback;
-// clang-format on
+    (__NON_NULL void (^)(__KINDOF(UICollectionViewCell)__NON_NULL_PTR cell,
+                         __KINDOF(NSObject)__NON_NULL_PTR object))callback;
 
 @end

FirebaseUI/API/FirebaseTableViewDataSource.h

@@ -89,8 +89,8 @@
  * provided by the datasource.
  */
 @property(strong, nonatomic, __NON_NULL) void (^populateCell)
-    (__KINDOF(UITableViewCell *) __NON_NULL_PTR cell,
-     __KINDOF(NSObject *) __NON_NULL_PTR object);
+    (__KINDOF(UITableViewCell) __NON_NULL_PTR cell,
+     __KINDOF(NSObject) __NON_NULL_PTR object);
 
 /**
  * Initialize an instance of FirebaseTableViewDataSource that populates
@@ -250,10 +250,8 @@
  * subclass) and the
  * corresponding object to populate the cell with.
  */
-// clang-format off
 - (void)populateCellWithBlock:
-    (nonnull void (^)(__KINDOF(UITableViewCell *)__NON_NULL_PTR cell,
-                      __KINDOF(NSObject *)__NON_NULL_PTR object))callback;
-// clang-format on
+    (__NON_NULL void (^)(__KINDOF(UITableViewCell)__NON_NULL_PTR cell,
+                         __KINDOF(NSObject)__NON_NULL_PTR object))callback;
 
 @end

FirebaseUI/Implementation/FirebaseCollectionViewDataSource.m

@@ -224,12 +224,10 @@ - (NSInteger)collectionView:(nonnull UICollectionView *)collectionView
   return [self.array count];
 }
 
-// clang-format off
 - (void)populateCellWithBlock:
-    (__NON_NULL void (^)(__KINDOF(UICollectionViewCell *) __NON_NULL_PTR cell,
-                         __KINDOF(NSObject *) __NON_NULL_PTR object))callback {
+    (__NON_NULL void (^)(__KINDOF(UICollectionViewCell)__NON_NULL_PTR cell,
+                         __KINDOF(NSObject)__NON_NULL_PTR object))callback {
   self.populateCell = callback;
 }
-// clang-format on
 
 @end

FirebaseUI/Implementation/FirebaseTableViewDataSource.m

@@ -227,12 +227,10 @@ - (NSInteger)tableView:(UITableView *)tableView
   return [self.array count];
 }
 
-// clang-format off
 - (void)populateCellWithBlock:
-    (nonnull void (^)(__KINDOF(UITableViewCell *) __NON_NULL_PTR cell,
-                      __KINDOF(NSObject *) __NON_NULL_PTR object))callback {
+    (__NON_NULL void (^)(__KINDOF(UITableViewCell)__NON_NULL_PTR cell,
+                         __KINDOF(NSObject)__NON_NULL_PTR object))callback {
   self.populateCell = callback;
 }
-// clang-format on
 
 @end

FirebaseUI/XCodeMacros.h

@@ -28,7 +28,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// clang-format ongit 
+// clang-format on
 
 #ifndef XCodeMacros_h
 #define XCodeMacros_h
@@ -56,9 +56,9 @@
 #endif
 
 #if defined(__has_feature) && __has_feature(objc_kindof)
-#define __KINDOF(class) __kindof class
+#define __KINDOF(cls) __kindof cls *
 #else
-#define __KINDOF id
+#define __KINDOF(cls) id
 #endif
 
 #endif