Improve/use shorthand syntax for unwrapping optionals and fix typos (#12369)

Author: sheikhbayazid

Example/tvOSSample/tvOSSample/AuthViewController.swift

@@ -55,7 +55,7 @@ class AuthViewController: UIViewController {
   // MARK: - Internal Helpers
 
   private func setUserSignedIn(_ user: User?) {
-    if let user = user {
+    if let user {
       providers.isHidden = true
       signedIn.isHidden = false
 

Example/watchOSSample/ServiceExtension/NotificationService.swift

@@ -25,7 +25,7 @@ class NotificationService: UNNotificationServiceExtension {
     self.contentHandler = contentHandler
     bestAttemptContent = (request.content.mutableCopy() as? UNMutableNotificationContent)
 
-    if let bestAttemptContent = bestAttemptContent {
+    if let bestAttemptContent {
       // Modify the notification content here...
       bestAttemptContent.title = "\(bestAttemptContent.title) 👩‍💻"
 
@@ -39,7 +39,7 @@ class NotificationService: UNNotificationServiceExtension {
     // Called just before the extension will be terminated by the system.
     // Use this as an opportunity to deliver your "best attempt" at modified content, otherwise the
     // original push payload will be used.
-    if let contentHandler = contentHandler, let bestAttemptContent = bestAttemptContent {
+    if let contentHandler, let bestAttemptContent {
       contentHandler(bestAttemptContent)
     }
   }

FirebaseAnalyticsSwift/README.md

@@ -90,11 +90,11 @@ extension View {
     func analyticsScreen(name: String, class screenClass: String? = nil, extraParameters: [String: Any]? = nil) -> some View {
         onAppear {
             var params: [String: Any] = [AnalyticsParameterScreenName: name]
-            if let screenClass = screenClass {
+            if let screenClass {
                 params[AnalyticsParameterScreenClass] = screenClass
             }
-            if let extraParams = extraParameters {
-                params.merge(extraParams) { _, new in new }
+            if let extraParameters {
+                params.merge(extraParameters) { _, new in new }
             }
             Analytics.logEvent(AnalyticsEventScreenView, parameters: params)
         }

FirebaseAppCheck/Apps/FIRAppCheckTestApp/FIRAppCheckTestApp/AppDelegate.swift

@@ -72,11 +72,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     DeviceCheckProvider(app: firebaseApp)?.getToken { token, error in
-      if let token = token {
+      if let token {
         print("DeviceCheck token: \(token.token), expiration date: \(token.expirationDate)")
       }
 
-      if let error = error {
+      if let error {
         print("DeviceCheck error: \((error as NSError).userInfo)")
       }
     }
@@ -91,11 +91,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
       print("Debug token: \(debugProvider.currentDebugToken())")
 
       debugProvider.getToken { token, error in
-        if let token = token {
+        if let token {
           print("Debug FAC token: \(token.token), expiration date: \(token.expirationDate)")
         }
 
-        if let error = error {
+        if let error {
           print("Debug error: \(error)")
         }
       }
@@ -106,11 +106,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
   func requestLimitedUseToken() {
     AppCheck.appCheck().limitedUseToken { result, error in
-      if let result = result {
+      if let result {
         print("FAC limited-use token: \(result.token), expiration date: \(result.expirationDate)")
       }
 
-      if let error = error {
+      if let error {
         print("Error: \(String(describing: error))")
       }
     }
@@ -128,11 +128,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     appAttestProvider.getToken { token, error in
-      if let token = token {
+      if let token {
         print("App Attest FAC token: \(token.token), expiration date: \(token.expirationDate)")
       }
 
-      if let error = error {
+      if let error {
         print("App Attest error: \(error)")
       }
     }

FirebaseAppCheck/Tests/Unit/Swift/AppCheckAPITests.swift

@@ -119,7 +119,7 @@ final class AppCheckAPITests {
     // MARK: - AppCheckErrors
 
     AppCheck.appCheck().token(forcingRefresh: false) { _, error in
-      if let error = error {
+      if let error {
         switch error {
         case AppCheckErrorCode.unknown:
           break

FirebaseAuth/Tests/Sample/SwiftApiTests/AccountInfoTests.swift

@@ -43,7 +43,7 @@ class AccountInfoTests: TestsBase {
     let auth = Auth.auth()
     let expectation1 = expectation(description: "Created account with email and password.")
     auth.createUser(withEmail: kOldUserEmail, password: "password") { user, error in
-      if let error = error {
+      if let error {
         XCTAssertEqual((error as NSError).code,
                        AuthErrorCode.emailAlreadyInUse.rawValue,
                        "Created a user despite it already exiting.")

FirebaseAuth/Tests/Sample/SwiftApiTests/EmailPasswordTests.swift

@@ -29,7 +29,7 @@ class EmailPasswordTests: TestsBase {
     let auth = Auth.auth()
     let expectation = self.expectation(description: "Created account with email and password.")
     auth.createUser(withEmail: kNewEmailToCreateUser, password: "password") { result, error in
-      if let error = error {
+      if let error {
         print("createUserWithEmail has error: \(error)")
       }
       expectation.fulfill()

FirebaseAuth/Tests/Sample/SwiftApiTests/FacebookTests.swift

@@ -30,7 +30,7 @@ import XCTest
 //    let credential = FacebookAuthProvider.credential(withAccessToken: facebookAccessToken)
 //    let expectation = self.expectation(description: "Signing in with Facebook finished.")
 //    auth.signIn(with: credential) { result, error in
-//      if let error = error {
+//      if let error {
 //        XCTFail("Signing in with Facebook had error: \(error)")
 //      } else {
 //        XCTAssertEqual(auth.currentUser?.displayName, Credentials.kFacebookUserName)
@@ -69,7 +69,7 @@ import XCTest
 //    let credential = FacebookAuthProvider.credential(withAccessToken: facebookAccessToken)
 //    let expectation = self.expectation(description: "Facebook linking finished.")
 //    auth.currentUser?.link(with: credential, completion: { result, error in
-//      if let error = error {
+//      if let error {
 //        XCTFail("Link to Firebase error: \(error)")
 //      } else {
 //        guard let providers = (auth.currentUser?.providerData) else {
@@ -124,7 +124,7 @@ import XCTest
 //    fetcher.setRequestValue("text/plain", forHTTPHeaderField: "Content-Type")
 //    let expectation = self.expectation(description: "Creating Facebook account finished.")
 //    fetcher.beginFetch { data, error in
-//      if let error = error {
+//      if let error {
 //        let error = error as NSError
 //        if let message = String(data: error.userInfo["data"] as! Data, encoding: .utf8) {
 //          // May get transient errors here for too many api calls when tests run frequently.
@@ -181,7 +181,7 @@ import XCTest
 //    fetcher.setRequestValue("text/plain", forHTTPHeaderField: "Content-Type")
 //    let expectation = self.expectation(description: "Deleting Facebook account finished.")
 //    fetcher.beginFetch { data, error in
-//      if let error = error {
+//      if let error {
 //        XCTFail("Deleting Facebook account failed with error: \(error)")
 //      }
 //      expectation.fulfill()

FirebaseAuth/Tests/Sample/SwiftApiTests/GoogleTests.swift

@@ -29,7 +29,7 @@ class GoogleTests: TestsBase {
                                                    accessToken: googleAccessToken)
     let expectation = self.expectation(description: "Signing in with Google finished.")
     auth.signIn(with: credential) { result, error in
-      if let error = error {
+      if let error {
         print("Signing in with Google had error: \(error)")
       }
       expectation.fulfill()
@@ -65,7 +65,7 @@ class GoogleTests: TestsBase {
     fetcher.setRequestValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
     let expectation = self.expectation(description: "Exchanging Google account tokens finished.")
     fetcher.beginFetch { data, error in
-      if let error = error {
+      if let error {
         XCTFail("Exchanging Google account tokens finished with error: \(error)")
       } else {
         do {

FirebaseAuth/Tests/Sample/SwiftApiTests/TestsBase.swift

@@ -38,7 +38,7 @@ class TestsBase: XCTestCase {
 
     let expectation = self.expectation(description: "Anonymous sign-in finished.")
     auth.signInAnonymously { result, error in
-      if let error = error {
+      if let error {
         print("Anonymous sign in error: \(error)")
       }
       expectation.fulfill()
@@ -59,7 +59,7 @@ class TestsBase: XCTestCase {
     let auth = Auth.auth()
     let expectation = self.expectation(description: "Delete current user finished.")
     auth.currentUser?.delete { error in
-      if let error = error {
+      if let error {
         print("Anonymous sign in error: \(error)")
       }
       expectation.fulfill()