Swift linting, part 3

Author: mindgraffiti

WooCommerce/Classes/Analytics/WooAnalytics.swift

@@ -148,13 +148,25 @@ private extension WooAnalytics {
             return
         }
 
-        NotificationCenter.default.addObserver(self, selector: #selector(trackApplicationOpened), name: UIApplication.didBecomeActiveNotification, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(trackApplicationClosed), name: UIApplication.didEnterBackgroundNotification, object: nil)
+        NotificationCenter.default.addObserver(self,
+                                               selector: #selector(trackApplicationOpened),
+                                               name: UIApplication.didBecomeActiveNotification,
+                                               object: nil)
+
+        NotificationCenter.default.addObserver(self,
+                                               selector: #selector(trackApplicationClosed),
+                                               name: UIApplication.didEnterBackgroundNotification,
+                                               object: nil)
     }
 
     func stopObservingNotifications() {
-        NotificationCenter.default.removeObserver(self, name: UIApplication.didBecomeActiveNotification, object: nil)
-        NotificationCenter.default.removeObserver(self, name: UIApplication.didEnterBackgroundNotification, object: nil)
+        NotificationCenter.default.removeObserver(self,
+                                                  name: UIApplication.didBecomeActiveNotification,
+                                                  object: nil)
+
+        NotificationCenter.default.removeObserver(self,
+                                                  name: UIApplication.didEnterBackgroundNotification,
+                                                  object: nil)
     }
 
     @objc func trackApplicationOpened() {

WooCommerce/Classes/AppDelegate.swift

@@ -116,17 +116,23 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         pushNotesManager.registrationDidFail(with: error)
     }
 
-    func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
+    func application(_ application: UIApplication,
+                     didReceiveRemoteNotification userInfo: [AnyHashable: Any],
+                     fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
         pushNotesManager.handleNotification(userInfo, completionHandler: completionHandler)
     }
 
     func applicationWillResignActive(_ application: UIApplication) {
-        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-        // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
+        // Sent when the application is about to move from active to inactive state.
+        // This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message)
+        // or when the user quits the application and it begins the transition to the background state.
+        // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks.
+        // Games should use this method to pause the game.
     }
 
     func applicationDidEnterBackground(_ application: UIApplication) {
-        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+        // Use this method to release shared resources, save user data, invalidate timers,
+        // and store enough application state information to restore your application to its current state in case it is terminated later.
         // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
     }
 
@@ -135,7 +141,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     func applicationDidBecomeActive(_ application: UIApplication) {
-        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+        // Restart any tasks that were paused (or not yet started) while the application was inactive.
+        // If the application was previously in the background, optionally refresh the user interface.
 
         RequirementsChecker.checkMinimumWooVersionForDefaultStore()
     }

WooCommerce/Classes/Authentication/AuthenticationConstants.swift

@@ -6,13 +6,22 @@ struct AuthenticationConstants {
 
     /// Email login instructions.
     ///
-    static let emailInstructions = NSLocalizedString("Log in with your WordPress.com account email address to manage your WooCommerce stores.", comment: "Sign in instructions on the 'log in using email' screen.")
+    static let emailInstructions = NSLocalizedString(
+        "Log in with your WordPress.com account email address to manage your WooCommerce stores.",
+        comment: "Sign in instructions on the 'log in using email' screen."
+    )
 
     /// Login with Jetpack instructions.
     ///
-    static let jetpackInstructions = NSLocalizedString("Log in with your WordPress.com account email address to manage your WooCommerce stores.", comment: "Sign in instructions on the 'log in using email' screen.")
+    static let jetpackInstructions = NSLocalizedString(
+        "Log in with your WordPress.com account email address to manage your WooCommerce stores.",
+        comment: "Sign in instructions on the 'log in using email' screen."
+    )
 
     /// Login with site URL instructions.
     ///
-    static let siteInstructions = NSLocalizedString("Enter the address of your WooCommerce store you'd like to connect.", comment: "Sign in instructions for logging in with a URL.")
+    static let siteInstructions = NSLocalizedString(
+        "Enter the address of your WooCommerce store you'd like to connect.",
+        comment: "Sign in instructions for logging in with a URL."
+    )
 }

WooCommerce/Classes/Authentication/Epilogue/StorePickerViewController.swift

@@ -314,8 +314,13 @@ private extension StorePickerViewController {
     /// Displays the Error Notice for the version check.
     ///
     func displayVersionCheckErrorNotice(siteID: Int, siteName: String) {
-        let message = String.localizedStringWithFormat(NSLocalizedString("Unable to successfully connect to %@",
-                                                                         comment: "On the site picker screen, the error displayed when connecting to a site fails. It reads: Unable to successfully connect to {site name}"), siteName)
+        let message = String.localizedStringWithFormat(
+            NSLocalizedString(
+                "Unable to successfully connect to %@",
+                comment: "On the site picker screen, the error displayed when connecting to a site fails. It reads: Unable to successfully connect to {site name}"
+            ),
+            siteName
+        )
         let actionTitle = NSLocalizedString("Retry", comment: "Retry Action")
         let notice = Notice(title: message, feedbackType: .error, actionTitle: actionTitle) { [weak self] in
             self?.displaySiteWCRequirementWarningIfNeeded(siteID: siteID, siteName: siteName)

WooCommerce/Classes/Authentication/Prologue/LoginPrologueViewController.swift

@@ -152,7 +152,10 @@ private extension LoginPrologueViewController {
     /// Returns the Disclaimer Attributed Text (which contains a link to the Jetpack Setup URL).
     ///
     var disclaimerAttributedText: NSAttributedString {
-        let disclaimerText = NSLocalizedString("This app requires Jetpack to connect to your Store. <br /> Read the <a href=\"https://jetpack.com/support/getting-started-with-jetpack/\">configuration instructions</a>.", comment: "Login Disclaimer Text and Jetpack config instructions. It reads: 'This app requires Jetpack to connect to your Store. Read the configuration instructions.' and it links to a web page on the words 'configuration instructions'. Place the second sentence after the `<br />` tag. Place the noun, 'configuration instructions' between the opening `<a` tag and the closing `</a>` tags. If a literal translation of 'Read the configuration instructions' does not make sense in your language, please use a contextually appropriate substitution. For example, you can translate it to say 'See: instructions' or any alternative that sounds natural in your language.")
+        let disclaimerText = NSLocalizedString(
+            "This app requires Jetpack to connect to your Store. <br /> Read the <a href=\"https://jetpack.com/support/getting-started-with-jetpack/\">configuration instructions</a>.",
+            comment: "Login Disclaimer Text and Jetpack config instructions. It reads: 'This app requires Jetpack to connect to your Store. Read the configuration instructions.' and it links to a web page on the words 'configuration instructions'. Place the second sentence after the `<br />` tag. Place the noun, 'configuration instructions' between the opening `<a` tag and the closing `</a>` tags. If a literal translation of 'Read the configuration instructions' does not make sense in your language, please use a contextually appropriate substitution. For example, you can translate it to say 'See: instructions' or any alternative that sounds natural in your language."
+        )
         let disclaimerAttributes: [NSAttributedString.Key: Any] = [
             .font: UIFont.font(forStyle: .caption1, weight: .thin),
             .foregroundColor: UIColor.white

WooCommerce/Classes/Extensions/Date+Woo.swift

@@ -72,11 +72,29 @@ extension Date {
 private extension Date {
 
     enum Strings {
-        static let presentDeicticExpression     = NSLocalizedString("Updated moments ago", comment: "Deictic expression for a data update that occurred in the very recent past - similar to 'Updated just now'")
-        static let singularMinuteUpdateStatment = NSLocalizedString("Updated %ld minute ago", comment: "Singular of 'minute' — date and time string that represents the time interval since last data update when exactly 1 minute ago. Usage example: Updated 1 minute ago")
-        static let pluralMinuteUpdateStatment   = NSLocalizedString("Updated %ld minutes ago", comment: "Plural of 'minute' — date and time string that represents the time interval since last data update when greater than 1 minute ago. Usage example: Updated 55 minutes ago")
-        static let singularHourUpdateStatment   = NSLocalizedString("Updated %ld hour ago", comment: "Singular of 'hour' — date and time string that represents the time interval since last data update when exactly 1 hour ago. Usage example: Updated 1 hour ago")
-        static let pluralHourUpdateStatment     = NSLocalizedString("Updated %ld hours ago", comment: "Plural of 'hour' — date and time string that represents the time interval since last data update when greater than 1 hour ago. Usage example: Updated 14 hours ago")
-        static let longFormUpdateStatement      = NSLocalizedString("Updated on %@", comment: "A specific date and time string which represents when the data was last updated. Usage example: Updated on Jan 22, 2019 3:31PM")
+        static let presentDeicticExpression = NSLocalizedString(
+            "Updated moments ago",
+            comment: "Deictic expression for a data update that occurred in the very recent past - similar to 'Updated just now'"
+        )
+        static let singularMinuteUpdateStatment = NSLocalizedString(
+            "Updated %ld minute ago",
+            comment: "Singular of 'minute' — date and time string that represents the time interval since last data update when exactly 1 minute ago. Usage example: Updated 1 minute ago"
+        )
+        static let pluralMinuteUpdateStatment = NSLocalizedString(
+            "Updated %ld minutes ago",
+            comment: "Plural of 'minute' — date and time string that represents the time interval since last data update when greater than 1 minute ago. Usage example: Updated 55 minutes ago"
+        )
+        static let singularHourUpdateStatment = NSLocalizedString(
+            "Updated %ld hour ago",
+            comment: "Singular of 'hour' — date and time string that represents the time interval since last data update when exactly 1 hour ago. Usage example: Updated 1 hour ago"
+        )
+        static let pluralHourUpdateStatment = NSLocalizedString(
+            "Updated %ld hours ago",
+            comment: "Plural of 'hour' — date and time string that represents the time interval since last data update when greater than 1 hour ago. Usage example: Updated 14 hours ago"
+        )
+        static let longFormUpdateStatement = NSLocalizedString(
+            "Updated on %@",
+            comment: "A specific date and time string which represents when the data was last updated. Usage example: Updated on Jan 22, 2019 3:31PM"
+        )
     }
 }

WooCommerce/Classes/Extensions/String+HTML.swift

@@ -31,7 +31,10 @@ extension String {
     var htmlToAttributedString: NSAttributedString {
         guard let data = data(using: .utf8) else { return NSAttributedString() }
         do {
-            return try NSAttributedString(data: data, options: [.documentType: NSAttributedString.DocumentType.html, .characterEncoding: String.Encoding.utf8.rawValue], documentAttributes: nil)
+            return try NSAttributedString(data: data,
+                                          options: [.documentType: NSAttributedString.DocumentType.html,
+                                                    .characterEncoding: String.Encoding.utf8.rawValue],
+                                          documentAttributes: nil)
         } catch {
             DDLogError("Error: unable to convert HTML data to an attributed string")
             return NSAttributedString()

WooCommerce/Classes/ViewRelated/Dashboard/DashboardViewController.swift

@@ -80,13 +80,19 @@ private extension DashboardViewController {
     }
 
     private func configureTitle() {
-        let myStore = NSLocalizedString("My store", comment: "Title of the bottom tab item that presents the user's store dashboard, and default title for the store dashboard")
+        let myStore = NSLocalizedString(
+            "My store",
+            comment: "Title of the bottom tab item that presents the user's store dashboard, and default title for the store dashboard"
+        )
         title = StoresManager.shared.sessionManager.defaultSite?.name ?? myStore
         tabBarItem.title = myStore
     }
 
     private func resetTitle() {
-        let myStore = NSLocalizedString("My store", comment: "Title of the bottom tab item that presents the user's store dashboard, and default title for the store dashboard")
+        let myStore = NSLocalizedString(
+            "My store",
+            comment: "Title of the bottom tab item that presents the user's store dashboard, and default title for the store dashboard"
+        )
         title = myStore
         tabBarItem.title = myStore
     }
@@ -99,7 +105,10 @@ private extension DashboardViewController {
         rightBarButton.tintColor = .white
         rightBarButton.accessibilityLabel = NSLocalizedString("Settings", comment: "Accessibility label for the Settings button.")
         rightBarButton.accessibilityTraits = .button
-        rightBarButton.accessibilityHint = NSLocalizedString("Navigates to Settings.", comment: "VoiceOver accessibility hint, informing the user the button can be used to navigate to the Settings screen.")
+        rightBarButton.accessibilityHint = NSLocalizedString(
+            "Navigates to Settings.",
+            comment: "VoiceOver accessibility hint, informing the user the button can be used to navigate to the Settings screen."
+        )
         navigationItem.setRightBarButton(rightBarButton, animated: false)
 
         // Don't show the Dashboard title in the next-view's back button

WooCommerce/Classes/ViewRelated/Dashboard/MyStore/Cells/NoPeriodDataTableViewCell.swift

@@ -12,7 +12,10 @@ class NoPeriodDataTableViewCell: UITableViewCell {
     @IBOutlet private var legendLabel: UILabel! {
         didSet {
             legendLabel.applySubheadlineStyle()
-            legendLabel.text = NSLocalizedString("No activity this period", comment: "Default text for Top Performers section when no data exists for a given period.")
+            legendLabel.text = NSLocalizedString(
+                "No activity this period",
+                comment: "Default text for Top Performers section when no data exists for a given period."
+            )
         }
     }
 }

WooCommerce/Classes/ViewRelated/Dashboard/MyStore/Cells/ProductTableViewCell.swift

@@ -53,7 +53,11 @@ class ProductTableViewCell: UITableViewCell {
 extension ProductTableViewCell {
     func configure(_ statsItem: TopEarnerStatsItem?) {
         nameText = statsItem?.productName
-        detailText = String.localizedStringWithFormat( NSLocalizedString("Total Product Order: %ld", comment: "Top performers — label for the total number of products ordered"), statsItem?.quantity ?? 0)
+        detailText = String.localizedStringWithFormat(
+            NSLocalizedString("Total Product Order: %ld",
+                              comment: "Top performers — label for the total number of products ordered"),
+            statsItem?.quantity ?? 0
+        )
         priceText = statsItem?.formattedTotalString
 
         if let productURLString = statsItem?.imageUrl {