chore: more swift format

Author: MichaelVerdon

packages/firebase_database/firebase_database/ios/firebase_database/Package.swift

@@ -16,7 +16,8 @@ enum ConfigurationError: Error {
 
 let databaseDirectory = String(
   URL(string: #file)!.deletingLastPathComponent().absoluteString
-    .dropLast())
+    .dropLast()
+)
 
 func loadFirebaseSDKVersion() throws -> String {
   let firebaseCoreScriptPath = NSString.path(withComponents: [
@@ -88,10 +89,10 @@ guard let shared_spm_version = Version("\(firebase_core_version_string)\(shared_
 let package = Package(
   name: "firebase_database",
   platforms: [
-    .iOS("15.0")
+    .iOS("15.0"),
   ],
   products: [
-    .library(name: "firebase-database", targets: ["firebase_database"])
+    .library(name: "firebase-database", targets: ["firebase_database"]),
   ],
   dependencies: [
     .package(url: "https://github.com/firebase/firebase-ios-sdk", from: firebase_sdk_version),
@@ -106,13 +107,13 @@ let package = Package(
         .product(name: "firebase-core-shared", package: "flutterfire"),
       ],
       resources: [
-        .process("Resources")
+        .process("Resources"),
       ],
       cSettings: [
         .headerSearchPath("include"),
         .define("LIBRARY_VERSION", to: "\"\(library_version)\""),
         .define("LIBRARY_NAME", to: "\"flutter-fire-rtdb\""),
       ]
-    )
+    ),
   ]
 )

packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseObserveStreamHandler.swift

@@ -17,21 +17,21 @@ import Flutter
   }
 
   func onListen(withArguments arguments: Any?, eventSink events: @escaping FlutterEventSink)
-    -> FlutterError?
-  {
+    -> FlutterError? {
     guard let args = arguments as? [String: Any],
-      let eventTypeString = args["eventType"] as? String
+          let eventTypeString = args["eventType"] as? String
     else {
       return nil
     }
 
     let observeBlock: (DataSnapshot, String?) -> Void = { [weak self] snapshot, previousChildKey in
       var eventDictionary: [String: Any] = [
-        "eventType": eventTypeString
+        "eventType": eventTypeString,
       ]
 
       let snapshotDict = FLTFirebaseDatabaseUtils.dictionary(
-        from: snapshot, withPreviousChildKey: previousChildKey)
+        from: snapshot, withPreviousChildKey: previousChildKey
+      )
       eventDictionary.merge(snapshotDict) { _, new in new }
 
       DispatchQueue.main.async {
@@ -60,7 +60,8 @@ import Flutter
 
     let eventType = FLTFirebaseDatabaseUtils.eventType(from: eventTypeString)
     databaseHandle = databaseQuery.observe(
-      eventType, andPreviousSiblingKeyWith: observeBlock, withCancel: cancelBlock)
+      eventType, andPreviousSiblingKeyWith: observeBlock, withCancel: cancelBlock
+    )
 
     return nil
   }

packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabasePlugin.swift

@@ -23,7 +23,7 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug
   private var listenerCount: Int = 0
 
   init(messenger: FlutterBinaryMessenger, channel: FlutterMethodChannel) {
-    self.binaryMessenger = messenger
+    binaryMessenger = messenger
     self.channel = channel
     super.init()
   }
@@ -99,7 +99,8 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug
       databaseGoOffline(arguments: call.arguments, withMethodCallResult: methodCallResult)
     case "FirebaseDatabase#purgeOutstandingWrites":
       databasePurgeOutstandingWrites(
-        arguments: call.arguments, withMethodCallResult: methodCallResult)
+        arguments: call.arguments, withMethodCallResult: methodCallResult
+      )
     case "DatabaseReference#set":
       databaseSet(arguments: call.arguments, withMethodCallResult: methodCallResult)
     case "DatabaseReference#setWithPriority":
@@ -137,121 +138,113 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug
   }
 
   public func pluginConstants(for firebaseApp: FirebaseApp) -> [AnyHashable: Any] {
-    return [:]
+    [:]
   }
 
   @objc public func firebaseLibraryName() -> String {
-    return "flutter-fire-rtdb"
+    "flutter-fire-rtdb"
   }
 
   @objc public func firebaseLibraryVersion() -> String {
-    return "12.0.1"
+    "12.0.1"
   }
 
   @objc public func flutterChannelName() -> String {
-    return kFLTFirebaseDatabaseChannelName
+    kFLTFirebaseDatabaseChannelName
   }
 
   // MARK: - Database API
 
-  private func databaseGoOnline(
-    arguments: Any?, withMethodCallResult result: FLTFirebaseMethodCallResult
-  ) {
+  private func databaseGoOnline(arguments: Any?,
+                                withMethodCallResult result: FLTFirebaseMethodCallResult) {
     guard let args = arguments as? [String: Any] else { return }
     let database = FLTFirebaseDatabaseUtils.database(from: args)
     database.goOnline()
     result.success(nil)
   }
 
-  private func databaseGoOffline(
-    arguments: Any?, withMethodCallResult result: FLTFirebaseMethodCallResult
-  ) {
+  private func databaseGoOffline(arguments: Any?,
+                                 withMethodCallResult result: FLTFirebaseMethodCallResult) {
     guard let args = arguments as? [String: Any] else { return }
     let database = FLTFirebaseDatabaseUtils.database(from: args)
     database.goOffline()
     result.success(nil)
   }
 
-  private func databasePurgeOutstandingWrites(
-    arguments: Any?, withMethodCallResult result: FLTFirebaseMethodCallResult
-  ) {
+  private func databasePurgeOutstandingWrites(arguments: Any?,
+                                              withMethodCallResult result: FLTFirebaseMethodCallResult) {
     guard let args = arguments as? [String: Any] else { return }
     let database = FLTFirebaseDatabaseUtils.database(from: args)
     database.purgeOutstandingWrites()
     result.success(nil)
   }
 
-  private func databaseSet(
-    arguments: Any?, withMethodCallResult result: FLTFirebaseMethodCallResult
-  ) {
+  private func databaseSet(arguments: Any?,
+                           withMethodCallResult result: FLTFirebaseMethodCallResult) {
     guard let args = arguments as? [String: Any] else { return }
     let reference = FLTFirebaseDatabaseUtils.databaseReference(from: args)
     let value = args["value"]
 
     reference.setValue(value) { error, _ in
-      if let error = error {
+      if let error {
         result.error(nil, nil, nil, error)
       } else {
         result.success(nil)
       }
     }
   }
 
-  private func databaseSetWithPriority(
-    arguments: Any?, withMethodCallResult result: FLTFirebaseMethodCallResult
-  ) {
+  private func databaseSetWithPriority(arguments: Any?,
+                                       withMethodCallResult result: FLTFirebaseMethodCallResult) {
     guard let args = arguments as? [String: Any] else { return }
     let reference = FLTFirebaseDatabaseUtils.databaseReference(from: args)
     let value = args["value"]
     let priority = args["priority"]
 
     reference.setValue(value, andPriority: priority) { error, _ in
-      if let error = error {
+      if let error {
         result.error(nil, nil, nil, error)
       } else {
         result.success(nil)
       }
     }
   }
 
-  private func databaseUpdate(
-    arguments: Any?, withMethodCallResult result: FLTFirebaseMethodCallResult
-  ) {
+  private func databaseUpdate(arguments: Any?,
+                              withMethodCallResult result: FLTFirebaseMethodCallResult) {
     guard let args = arguments as? [String: Any],
-      let values = args["value"] as? [String: Any]
+          let values = args["value"] as? [String: Any]
     else { return }
     let reference = FLTFirebaseDatabaseUtils.databaseReference(from: args)
 
     reference.updateChildValues(values) { error, _ in
-      if let error = error {
+      if let error {
         result.error(nil, nil, nil, error)
       } else {
         result.success(nil)
       }
     }
   }
 
-  private func databaseSetPriority(
-    arguments: Any?, withMethodCallResult result: FLTFirebaseMethodCallResult
-  ) {
+  private func databaseSetPriority(arguments: Any?,
+                                   withMethodCallResult result: FLTFirebaseMethodCallResult) {
     guard let args = arguments as? [String: Any] else { return }
     let reference = FLTFirebaseDatabaseUtils.databaseReference(from: args)
     let priority = args["priority"]
 
     reference.setPriority(priority) { error, _ in
-      if let error = error {
+      if let error {
         result.error(nil, nil, nil, error)
       } else {
         result.success(nil)
       }
     }
   }
 
-  private func databaseRunTransaction(
-    arguments: Any?, withMethodCallResult result: FLTFirebaseMethodCallResult
-  ) {
+  private func databaseRunTransaction(arguments: Any?,
+                                      withMethodCallResult result: FLTFirebaseMethodCallResult) {
     guard let args = arguments as? [String: Any],
-      let transactionKey = args["transactionKey"] as? Int
+          let transactionKey = args["transactionKey"] as? Int
     else { return }
     let reference = FLTFirebaseDatabaseUtils.databaseReference(from: args)
     let applyLocally = args["transactionApplyLocally"] as? Bool ?? false
@@ -291,9 +284,9 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug
       }
       return TransactionResult.success(withValue: currentData)
     } andCompletionBlock: { error, committed, snapshot in
-      if let error = error {
+      if let error {
         result.error(nil, nil, nil, error)
-      } else if let snapshot = snapshot {
+      } else if let snapshot {
         let snapshotDict = FLTFirebaseDatabaseUtils.dictionary(from: snapshot)
         result.success([
           "committed": committed,
@@ -303,64 +296,60 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug
     }
   }
 
-  private func onDisconnectSet(
-    arguments: Any?, withMethodCallResult result: FLTFirebaseMethodCallResult
-  ) {
+  private func onDisconnectSet(arguments: Any?,
+                               withMethodCallResult result: FLTFirebaseMethodCallResult) {
     guard let args = arguments as? [String: Any] else { return }
     let reference = FLTFirebaseDatabaseUtils.databaseReference(from: args)
     let value = args["value"]
 
     reference.onDisconnectSetValue(value) { error, _ in
-      if let error = error {
+      if let error {
         result.error(nil, nil, nil, error)
       } else {
         result.success(nil)
       }
     }
   }
 
-  private func onDisconnectSetWithPriority(
-    arguments: Any?, withMethodCallResult result: FLTFirebaseMethodCallResult
-  ) {
+  private func onDisconnectSetWithPriority(arguments: Any?,
+                                           withMethodCallResult result: FLTFirebaseMethodCallResult) {
     guard let args = arguments as? [String: Any] else { return }
     let reference = FLTFirebaseDatabaseUtils.databaseReference(from: args)
     let value = args["value"]
     let priority = args["priority"]
 
     reference.onDisconnectSetValue(value, andPriority: priority) { error, _ in
-      if let error = error {
+      if let error {
         result.error(nil, nil, nil, error)
       } else {
         result.success(nil)
       }
     }
   }
 
-  private func onDisconnectUpdate(
-    arguments: Any?, withMethodCallResult result: FLTFirebaseMethodCallResult
-  ) {
+  private func onDisconnectUpdate(arguments: Any?,
+                                  withMethodCallResult result: FLTFirebaseMethodCallResult) {
     guard let args = arguments as? [String: Any],
-      let values = args["value"] as? [String: Any]
+          let values = args["value"] as? [String: Any]
     else { return }
     let reference = FLTFirebaseDatabaseUtils.databaseReference(from: args)
 
     reference.onDisconnectUpdateChildValues(values) { error, _ in
-      if let error = error {
+      if let error {
         result.error(nil, nil, nil, error)
       } else {
         result.success(nil)
       }
     }
   }
 
-  private func onDisconnectCancel(
-    arguments: Any?, withMethodCallResult result: FLTFirebaseMethodCallResult
-  ) {
+  private func onDisconnectCancel(arguments: Any?,
+                                  withMethodCallResult result: FLTFirebaseMethodCallResult) {
     guard let args = arguments as? [String: Any] else { return }
     let reference = FLTFirebaseDatabaseUtils.databaseReference(from: args)
 
     reference.cancelDisconnectOperations { error, _ in
-      if let error = error {
+      if let error {
         result.error(nil, nil, nil, error)
       } else {
         result.success(nil)
@@ -373,31 +362,29 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug
     let query = FLTFirebaseDatabaseUtils.databaseQuery(from: args)
 
     query.getData { error, snapshot in
-      if let error = error {
+      if let error {
         result.error(nil, nil, nil, error)
-      } else if let snapshot = snapshot {
+      } else if let snapshot {
         let snapshotDict = FLTFirebaseDatabaseUtils.dictionary(from: snapshot)
         result.success(["snapshot": snapshotDict])
       }
     }
   }
 
-  private func queryKeepSynced(
-    arguments: Any?, withMethodCallResult result: FLTFirebaseMethodCallResult
-  ) {
+  private func queryKeepSynced(arguments: Any?,
+                               withMethodCallResult result: FLTFirebaseMethodCallResult) {
     guard let args = arguments as? [String: Any],
-      let value = args["value"] as? Bool
+          let value = args["value"] as? Bool
     else { return }
     let query = FLTFirebaseDatabaseUtils.databaseQuery(from: args)
     query.keepSynced(value)
     result.success(nil)
   }
 
-  private func queryObserve(
-    arguments: Any?, withMethodCallResult result: FLTFirebaseMethodCallResult
-  ) {
+  private func queryObserve(arguments: Any?,
+                            withMethodCallResult result: FLTFirebaseMethodCallResult) {
     guard let args = arguments as? [String: Any],
-      let eventChannelNamePrefix = args["eventChannelNamePrefix"] as? String
+          let eventChannelNamePrefix = args["eventChannelNamePrefix"] as? String
     else { return }
 
     let databaseQuery = FLTFirebaseDatabaseUtils.databaseQuery(from: args)