Clang-formatting Storage

7 files changed, 30 insertions, 18 deletions

diff --git a/Firebase/Storage/Public/FIRStorage.h b/Firebase/Storage/Public/FIRStorage.h
index 3b37a0e..112b1c6 100644
--- a/Firebase/Storage/Public/FIRStorage.h
+++ b/Firebase/Storage/Public/FIRStorage.h
@@ -68,8 +68,7 @@ FIR_SWIFT_NAME(Storage)
  * @param url The gs:// url to your Firebase Storage Bucket.
  * @return the FIRStorage instance, initialized with the custom FIRApp.
  */
-+ (instancetype)storageForApp:(FIRApp *)app
-                          URL:(NSString *)url FIR_SWIFT_NAME(storage(app:url:));
++ (instancetype)storageForApp:(FIRApp *)app URL:(NSString *)url FIR_SWIFT_NAME(storage(app:url:));
 
 /**
  * The Firebase App associated with this Firebase Storage instance.
diff --git a/Firebase/Storage/Public/FIRStorageDownloadTask.h b/Firebase/Storage/Public/FIRStorageDownloadTask.h
index 252b910..f9d3e76 100644
--- a/Firebase/Storage/Public/FIRStorageDownloadTask.h
+++ b/Firebase/Storage/Public/FIRStorageDownloadTask.h
@@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Currently all uploads must be initiated and managed on the main queue.
  */
 FIR_SWIFT_NAME(StorageDownloadTask)
-@interface FIRStorageDownloadTask : FIRStorageObservableTask<FIRStorageTaskManagement>
+@interface FIRStorageDownloadTask : FIRStorageObservableTask <FIRStorageTaskManagement>
 
 @end
 
diff --git a/Firebase/Storage/Public/FIRStorageMetadata.h b/Firebase/Storage/Public/FIRStorageMetadata.h
index 8d844f7..61d95ca 100644
--- a/Firebase/Storage/Public/FIRStorageMetadata.h
+++ b/Firebase/Storage/Public/FIRStorageMetadata.h
@@ -30,7 +30,7 @@ NS_ASSUME_NONNULL_BEGIN
  * @see https://cloud.google.com/storage/docs/json_api/v1/objects#resource
  */
 FIR_SWIFT_NAME(StorageMetadata)
-@interface FIRStorageMetadata : NSObject<NSCopying>
+@interface FIRStorageMetadata : NSObject <NSCopying>
 
 /**
  * The name of the bucket containing this object.
@@ -118,14 +118,14 @@ FIR_SWIFT_NAME(StorageMetadata)
  * Creates an instanece of FIRStorageMetadata from the contents of a dictionary.
  * @return An instance of FIRStorageMetadata that represents the contents of a dictionary.
  */
-- (nullable instancetype)initWithDictionary:(NSDictionary <NSString *, id>*)dictionary
+- (nullable instancetype)initWithDictionary:(NSDictionary<NSString *, id> *)dictionary
     NS_DESIGNATED_INITIALIZER;
 
 /**
  * Creates an NSDictionary from the contents of the metadata.
  * @return An NSDictionary that represents the contents of the metadata.
  */
-- (NSDictionary <NSString *, id>*)dictionaryRepresentation;
+- (NSDictionary<NSString *, id> *)dictionaryRepresentation;
 
 /**
  * Determines if the current metadata represents a "file".
diff --git a/Firebase/Storage/Public/FIRStorageReference.h b/Firebase/Storage/Public/FIRStorageReference.h
index 0b85267..a85c738 100644
--- a/Firebase/Storage/Public/FIRStorageReference.h
+++ b/Firebase/Storage/Public/FIRStorageReference.h
@@ -110,9 +110,11 @@ FIR_SWIFT_NAME(StorageReference)
  * about the object being uploaded.
  * @return An instance of FIRStorageUploadTask, which can be used to monitor or manage the upload.
  */
+// clang-format off
 - (FIRStorageUploadTask *)putData:(NSData *)uploadData
                          metadata:(nullable FIRStorageMetadata *)metadata
-    FIR_SWIFT_NAME(putData(_:metadata:));
+FIR_SWIFT_NAME(putData(_:metadata:));
+// clang-format on
 
 /**
  * Asynchronously uploads data to the currently specified FIRStorageReference.
@@ -124,11 +126,13 @@ FIR_SWIFT_NAME(StorageReference)
  * or an error on failure.
  * @return An instance of FIRStorageUploadTask, which can be used to monitor or manage the upload.
  */
+// clang-format off
 - (FIRStorageUploadTask *)putData:(NSData *)uploadData
                          metadata:(nullable FIRStorageMetadata *)metadata
                        completion:(nullable void (^)(FIRStorageMetadata *_Nullable metadata,
                                                      NSError *_Nullable error))completion
-    FIR_SWIFT_NAME(putData(_:metadata:completion:));
+            FIR_SWIFT_NAME(putData(_:metadata:completion:));
+// clang-format on
 
 /**
  * Asynchronously uploads a file to the currently specified FIRStorageReference,
@@ -145,8 +149,11 @@ FIR_SWIFT_NAME(StorageReference)
  * about the object being uploaded.
  * @return An instance of FIRStorageUploadTask, which can be used to monitor or manage the upload.
  */
-- (FIRStorageUploadTask *)putFile:(NSURL *)fileURL metadata:(nullable FIRStorageMetadata *)metadata
-    FIR_SWIFT_NAME(putFile(from:metadata:));
+// clang-format off
+- (FIRStorageUploadTask *)putFile:(NSURL *)fileURL
+                         metadata:(nullable FIRStorageMetadata *)metadata
+           FIR_SWIFT_NAME(putFile(from:metadata:));
+// clang-format on
 
 /**
  * Asynchronously uploads a file to the currently specified FIRStorageReference.
@@ -157,11 +164,13 @@ FIR_SWIFT_NAME(StorageReference)
  * or an error on failure.
  * @return An instance of FIRStorageUploadTask, which can be used to monitor or manage the upload.
  */
+// clang-format off
 - (FIRStorageUploadTask *)putFile:(NSURL *)fileURL
                          metadata:(nullable FIRStorageMetadata *)metadata
                        completion:(nullable void (^)(FIRStorageMetadata *_Nullable metadata,
                                                      NSError *_Nullable error))completion
-    FIR_SWIFT_NAME(putFile(from:metadata:completion:));
+           FIR_SWIFT_NAME(putFile(from:metadata:completion:));
+// clang-format on
 
 #pragma mark - Downloads
 
@@ -175,10 +184,12 @@ FIR_SWIFT_NAME(StorageReference)
  * or an error on failure.
  * @return An FIRStorageDownloadTask that can be used to monitor or manage the download.
  */
+// clang-format off
 - (FIRStorageDownloadTask *)dataWithMaxSize:(int64_t)size
                                  completion:(void (^)(NSData *_Nullable data,
                                                       NSError *_Nullable error))completion
-    FIR_SWIFT_NAME(getData(maxSize:completion:));
+                     FIR_SWIFT_NAME(getData(maxSize:completion:));
+// clang-format on
 
 /**
  * Asynchronously retrieves a long lived download URL with a revokable token.
@@ -216,8 +227,8 @@ FIR_SWIFT_NAME(StorageReference)
  * @param completion A completion block which returns the object metadata on success,
  * or an error on failure.
  */
-- (void)metadataWithCompletion:(void (^)(FIRStorageMetadata *_Nullable metadata,
-                                         NSError *_Nullable error))completion
+- (void)metadataWithCompletion:
+    (void (^)(FIRStorageMetadata *_Nullable metadata, NSError *_Nullable error))completion
     FIR_SWIFT_NAME(getMetadata(completion:));
 
 /**
@@ -226,10 +237,12 @@ FIR_SWIFT_NAME(StorageReference)
  * @param completion A completion block which returns the FIRStorageMetadata on success,
  * or an error on failure.
  */
+// clang-format off
 - (void)updateMetadata:(FIRStorageMetadata *)metadata
             completion:(nullable void (^)(FIRStorageMetadata *_Nullable metadata,
                                           NSError *_Nullable error))completion
-    FIR_SWIFT_NAME(updateMetadata(_:completion:));
+FIR_SWIFT_NAME(updateMetadata(_:completion:));
+// clang-format on
 
 #pragma mark - Delete
 
diff --git a/Firebase/Storage/Public/FIRStorageSwiftNameSupport.h b/Firebase/Storage/Public/FIRStorageSwiftNameSupport.h
index 55e1bcc..216c047 100644
--- a/Firebase/Storage/Public/FIRStorageSwiftNameSupport.h
+++ b/Firebase/Storage/Public/FIRStorageSwiftNameSupport.h
@@ -24,6 +24,6 @@
 #define FIR_SWIFT_NAME(X) NS_SWIFT_NAME(X)
 #else
 #define FIR_SWIFT_NAME(X)  // Intentionally blank.
-#endif  // #ifdef __IPHONE_9_3
+#endif                     // #ifdef __IPHONE_9_3
 
 #endif  // FIR_SWIFT_NAME
diff --git a/Firebase/Storage/Public/FIRStorageTask.h b/Firebase/Storage/Public/FIRStorageTask.h
index 0428220..b49363c 100644
--- a/Firebase/Storage/Public/FIRStorageTask.h
+++ b/Firebase/Storage/Public/FIRStorageTask.h
@@ -47,7 +47,7 @@ FIR_SWIFT_NAME(StorageTask)
  * operations.
  */
 FIR_SWIFT_NAME(StorageTaskManagement)
-@protocol FIRStorageTaskManagement<NSObject>
+@protocol FIRStorageTaskManagement <NSObject>
 
 @required
 /**
diff --git a/Firebase/Storage/Public/FIRStorageUploadTask.h b/Firebase/Storage/Public/FIRStorageUploadTask.h
index cdf1d29..cf9bde8 100644
--- a/Firebase/Storage/Public/FIRStorageUploadTask.h
+++ b/Firebase/Storage/Public/FIRStorageUploadTask.h
@@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Currently all uploads must be initiated and managed on the main queue.
  */
 FIR_SWIFT_NAME(StorageUploadTask)
-@interface FIRStorageUploadTask : FIRStorageObservableTask<FIRStorageTaskManagement>
+@interface FIRStorageUploadTask : FIRStorageObservableTask <FIRStorageTaskManagement>
 
 @end