No Bug - Reenable swiftlint. Fix a small number of linting errors. (#3278)

Author: farhanpatel

.swiftlint.yml

@@ -1,20 +1,14 @@
 disabled_rules: # rule identifiers to exclude from running
   - variable_name
-  - legacy_cggeometry_functions
   - todo
   - trailing_newline
   - type_name
   - function_body_length
-  - force_try
-  - force_cast
   - missing_docs
   - valid_docs
   - cyclomatic_complexity
   - type_body_length
   - function_parameter_count
-  - trailing_whitespace
-  - leading_whitespace
-  - operator_whitespace
   - file_length
   - mark
   - unused_closure_parameter
@@ -28,6 +22,21 @@ disabled_rules: # rule identifiers to exclude from running
   - shorthand_operator
   - trailing_comma
   - unused_optional_binding
+  - private_over_fileprivate
+  - empty_enum_arguments
+  - discarded_notification_center_observer
+  - block_based_kvo
+  - nesting
+  - is_disjoint
+  - multiple_closures_with_trailing_closure
+  - fallthrough
+  - switch_case_alignment
+  - trailing_whitespace
+  - leading_whitespace
+  - operator_whitespace
+  - legacy_cggeometry_functions
+  - unneeded_break_in_switch
+  - closure_parameter_position
 opt_in_rules: # some rules are only opt-in
   - closing_brace
   - opening_brace

Account/FxAClient10.swift

@@ -146,7 +146,7 @@ open class FxAClient10 {
         if kB.count != 32 {
             return nil
         }
-        return kB.sha256.subdata(in:  0..<16).hexEncodedString
+        return kB.sha256.subdata(in: 0..<16).hexEncodedString
     }
 
     open class func quickStretchPW(_ email: Data, password: Data) -> Data {

Account/FxAState.swift

@@ -47,15 +47,15 @@ func state(fromJSON json: JSON) -> FxAState? {
     }
     if let version = json["version"].int {
         if version == StateSchemaVersion {
-            return stateV1(fromJSON:json)
+            return stateV1(fromJSON: json)
         }
     }
     return nil
 }
 
 func stateV1(fromJSON json: JSON) -> FxAState? {
     if let labelString = json["label"].string {
-        if let label = FxAStateLabel(rawValue:  labelString) {
+        if let label = FxAStateLabel(rawValue: labelString) {
             switch label {
             case .engagedBeforeVerified:
                 if let

Client/Application/AppDelegate.swift

@@ -737,7 +737,7 @@ extension AppDelegate {
         FxALoginHelper.sharedInstance.apnsRegisterDidFail()
     }
 
-    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) {
         if Logger.logPII && log.isEnabledFor(level: .info) {
             NSLog("APNS NOTIFICATION \(userInfo)")
         }
@@ -808,7 +808,7 @@ extension AppDelegate {
         }
     }
 
-    func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable : Any]) {
+    func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any]) {
         let completionHandler: (UIBackgroundFetchResult) -> Void = { _ in }
         self.application(application, didReceiveRemoteNotification: userInfo, fetchCompletionHandler: completionHandler)
     }

Client/Application/LeanplumIntegration.swift

@@ -225,7 +225,7 @@ class LeanplumIntegration {
         return true
     }
 
-    func setUserAttributes(attributes: [AnyHashable : Any]) {
+    func setUserAttributes(attributes: [AnyHashable: Any]) {
         DispatchQueue.main.async(execute: {
             if self.shouldSendToLP() {
                 Leanplum.setUserAttributes(attributes)

Client/Application/QuickActions.swift

@@ -102,7 +102,7 @@ class QuickActions: NSObject {
         return true
     }
 
-    fileprivate func handleShortCutItemOfType(_ type: ShortcutType, userData: [String : NSSecureCoding]?, browserViewController: BrowserViewController) {
+    fileprivate func handleShortCutItemOfType(_ type: ShortcutType, userData: [String: NSSecureCoding]?, browserViewController: BrowserViewController) {
         switch type {
         case .newTab:
             handleOpenNewTab(withBrowserViewController: browserViewController, isPrivate: false)

Client/Frontend/Browser/BackForwardTableViewCell.swift

@@ -43,7 +43,7 @@ class BackForwardTableViewCell: UITableViewCell {
     var isCurrentTab = false {
         didSet {
             if isCurrentTab {
-                label.font = UIFont(name:"HelveticaNeue-Bold", size: BackForwardViewCellUX.fontSize)
+                label.font = UIFont(name: "HelveticaNeue-Bold", size: BackForwardViewCellUX.fontSize)
             }
         }
     }
@@ -137,6 +137,6 @@ class BackForwardTableViewCell: UITableViewCell {
         connectingForwards = true
         connectingBackwards = true
         isCurrentTab = false
-        label.font = UIFont(name:"HelveticaNeue", size: BackForwardViewCellUX.fontSize)
+        label.font = UIFont(name: "HelveticaNeue", size: BackForwardViewCellUX.fontSize)
     }
 }

Client/Frontend/Browser/BrowserViewController.swift

@@ -923,7 +923,7 @@ class BrowserViewController: UIViewController {
         webView.evaluateJavaScript("__firefox__.metadata.extractMetadata()", completionHandler: nil)
 
         if #available(iOS 11, *) {
-            if (NoImageModeHelper.isActivated(profile.prefs)) {
+            if NoImageModeHelper.isActivated(profile.prefs) {
                 webView.evaluateJavaScript("__firefox__.NoImageMode.setEnabled(true)", completionHandler: nil)
             }
         }
@@ -1308,7 +1308,7 @@ extension BrowserViewController: URLBarDelegate {
         }
 
         let successCallback: (String) -> Void = { (successMessage) in
-            SimpleToast().showAlertWithText(successMessage, bottomContainer:self.webViewContainer)
+            SimpleToast().showAlertWithText(successMessage, bottomContainer: self.webViewContainer)
         }
 
         guard let tab = tabManager.selectedTab, tab.url != nil else { return }
@@ -1459,7 +1459,7 @@ extension BrowserViewController: URLBarDelegate {
 
         profile.bookmarks.getURLForKeywordSearch(possibleKeyword).uponQueue(DispatchQueue.main) { result in
             if var urlString = result.successValue,
-                let escapedQuery = possibleQuery.addingPercentEncoding(withAllowedCharacters:NSCharacterSet.urlQueryAllowed),
+                let escapedQuery = possibleQuery.addingPercentEncoding(withAllowedCharacters: NSCharacterSet.urlQueryAllowed),
                 let range = urlString.range(of: "%s") {
                 urlString.replaceSubrange(range, with: escapedQuery)
 
@@ -1533,7 +1533,7 @@ extension BrowserViewController: TabToolbarDelegate, PhotonActionSheetProtocol {
 
         let controller = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
         controller.addAction(UIAlertAction(title: toggleActionTitle, style: .default, handler: { _ in tab.toggleDesktopSite() }))
-        controller.addAction(UIAlertAction(title: NSLocalizedString("Cancel", comment:"Label for Cancel button"), style: .cancel, handler: nil))
+        controller.addAction(UIAlertAction(title: NSLocalizedString("Cancel", comment: "Label for Cancel button"), style: .cancel, handler: nil))
         controller.popoverPresentationController?.sourceView = toolbar ?? urlBar
         controller.popoverPresentationController?.sourceRect = button.frame
         present(controller, animated: true, completion: nil)
@@ -1553,7 +1553,7 @@ extension BrowserViewController: TabToolbarDelegate, PhotonActionSheetProtocol {
 
     func tabToolbarDidPressMenu(_ tabToolbar: TabToolbarProtocol, button: UIButton) {
         // ensure that any keyboards or spinners are dismissed before presenting the menu
-        UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to:nil, from:nil, for:nil)
+        UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
         var actions: [[PhotonActionSheetItem]] = []
 
         actions.append(getHomePanelActions())
@@ -2208,7 +2208,7 @@ extension BrowserViewController: UIAdaptivePresentationControllerDelegate {
 extension BrowserViewController: ReaderModeStyleViewControllerDelegate {
     func readerModeStyleViewController(_ readerModeStyleViewController: ReaderModeStyleViewController, didConfigureStyle style: ReaderModeStyle) {
         // Persist the new style to the profile
-        let encodedStyle: [String:Any] = style.encodeAsDictionary()
+        let encodedStyle: [String: Any] = style.encodeAsDictionary()
         profile.prefs.setObject(encodedStyle, forKey: ReaderModeProfileKeyStyle)
         // Change the reader mode style on all tabs that have reader mode active
         for tabIndex in 0..<tabManager.count {
@@ -2332,7 +2332,7 @@ extension BrowserViewController {
 
         var readerModeStyle = DefaultReaderModeStyle
         if let dict = profile.prefs.dictionaryForKey(ReaderModeProfileKeyStyle) {
-            if let style = ReaderModeStyle(dict: dict as [String : AnyObject]) {
+            if let style = ReaderModeStyle(dict: dict as [String: AnyObject]) {
                 readerModeStyle = style
             }
         }
@@ -2348,7 +2348,7 @@ extension BrowserViewController: ReaderModeBarViewDelegate {
             if let readerMode = tabManager.selectedTab?.getHelper(name: "ReaderMode") as? ReaderMode, readerMode.state == ReaderModeState.active {
                 var readerModeStyle = DefaultReaderModeStyle
                 if let dict = profile.prefs.dictionaryForKey(ReaderModeProfileKeyStyle) {
-                    if let style = ReaderModeStyle(dict: dict as [String : AnyObject]) {
+                    if let style = ReaderModeStyle(dict: dict as [String: AnyObject]) {
                         readerModeStyle = style
                     }
                 }
@@ -2773,7 +2773,7 @@ extension BrowserViewController {
 
                 self.profile.searchEngines.addSearchEngine(OpenSearchEngine(engineID: nil, shortName: shortName, image: image, searchTemplate: searchQuery, suggestTemplate: nil, isCustomEngine: true))
                 let Toast = SimpleToast()
-                Toast.showAlertWithText(Strings.ThirdPartySearchEngineAdded, bottomContainer:self.webViewContainer)
+                Toast.showAlertWithText(Strings.ThirdPartySearchEngineAdded, bottomContainer: self.webViewContainer)
             }
         }
 

Client/Frontend/Browser/ButtonToast.swift

@@ -85,7 +85,7 @@ class ButtonToast: UIView {
         button.titleLabel?.adjustsFontSizeToFitWidth = true
         button.titleLabel?.minimumScaleFactor = 0.1
 
-        let recognizer = UITapGestureRecognizer(target: self, action:#selector(ButtonToast.buttonPressed(_:)))
+        let recognizer = UITapGestureRecognizer(target: self, action: #selector(ButtonToast.buttonPressed(_:)))
         button.addGestureRecognizer(recognizer)
         toast.addSubview(button)
         var descriptionLabel: UILabel?

Client/Frontend/Browser/ContextMenuHelper.swift

@@ -71,7 +71,7 @@ extension ContextMenuHelper: TabHelper {
     }
 
     func userContentController(_ userContentController: WKUserContentController, didReceiveScriptMessage message: WKScriptMessage) {
-        guard let data = message.body as? [String : AnyObject] else {
+        guard let data = message.body as? [String: AnyObject] else {
             return
         }
 

Client/Frontend/Browser/MailtoLinkHandler.swift

@@ -7,7 +7,7 @@ import UIKit
 
 open class MailtoLinkHandler {
 
-    lazy var mailSchemeProviders: [String:MailProvider] = self.fetchMailSchemeProviders()
+    lazy var mailSchemeProviders: [String: MailProvider] = self.fetchMailSchemeProviders()
 
     func launchMailClientForScheme(_ scheme: String, metadata: MailToMetadata, defaultMailtoURL: URL) {
         guard let provider = mailSchemeProviders[scheme], let mailURL = provider.newEmailURLFromMetadata(metadata) else {
@@ -22,7 +22,7 @@ open class MailtoLinkHandler {
         }
     }
 
-    func fetchMailSchemeProviders() -> [String:MailProvider] {
+    func fetchMailSchemeProviders() -> [String: MailProvider] {
         var providerDict = [String: MailProvider]()
         if let path = Bundle.main.path(forResource: "MailSchemes", ofType: "plist"), let dictRoot = NSArray(contentsOfFile: path) {
             dictRoot.forEach({ dict in

Client/Frontend/Browser/QRCodeViewController.swift

@@ -56,7 +56,7 @@ class QRCodeViewController: UIViewController, AVCaptureMetadataOutputObjectsDele
         // Setup the NavigationBar
         self.navigationController?.navigationBar.barTintColor = QRCodeViewControllerUX.navigationBarBackgroundColor
         let navigationTitleAttribute: NSDictionary = NSDictionary(object: QRCodeViewControllerUX.navigationBarTitleColor, forKey: NSForegroundColorAttributeName as NSCopying)
-        self.navigationController?.navigationBar.titleTextAttributes = (navigationTitleAttribute as! [String : AnyObject])
+        self.navigationController?.navigationBar.titleTextAttributes = (navigationTitleAttribute as! [String: AnyObject])
 
         // Setup the NavigationItem
         self.navigationItem.leftBarButtonItem = UIBarButtonItem(image: UIImage(named: "qrcode-goBack"), style: UIBarButtonItemStyle.plain, target: self, action: #selector(goBack))
@@ -85,7 +85,7 @@ class QRCodeViewController: UIViewController, AVCaptureMetadataOutputObjectsDele
         self.view.addSubview(scanLine)
         self.view.addSubview(instructionsLabel)
 
-        scanRange = UIDevice.current.userInterfaceIdiom == .pad ? CGRect(x: 0, y: 0, width: view.frame.width / 2, height:  view.frame.width / 2) : CGRect(x: 0, y: 0, width:  view.frame.width / 3 * 2, height:  view.frame.width / 3 * 2)
+        scanRange = UIDevice.current.userInterfaceIdiom == .pad ? CGRect(x: 0, y: 0, width: view.frame.width / 2, height: view.frame.width / 2) : CGRect(x: 0, y: 0, width: view.frame.width / 3 * 2, height: view.frame.width / 3 * 2)
 
         scanRange.center = UIScreen.main.bounds.center
         scanBorderHeight = UIDevice.current.userInterfaceIdiom == .pad ? view.frame.width / 2 : view.frame.width / 3 * 2

Client/Frontend/Browser/TabManager.swift

@@ -809,7 +809,7 @@ extension TabManager {
     }
 }
 
-extension TabManager : WKNavigationDelegate {
+extension TabManager: WKNavigationDelegate {
     func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
         UIApplication.shared.isNetworkActivityIndicatorVisible = true
     }

Client/Frontend/Browser/TabPeekViewController.swift

@@ -63,7 +63,7 @@ class TabPeekViewController: UIViewController, WKNavigationDelegate {
                 actions.append(UIPreviewAction(title: TabPeekViewController.PreviewActionCopyURL, style: .default) { previewAction, viewController in
                     guard let url = self.tab?.canonicalURL else { return }
                     UIPasteboard.general.url = url
-                    SimpleToast().showAlertWithText(Strings.AppMenuCopyURLConfirmMessage, bottomContainer:self.view)
+                    SimpleToast().showAlertWithText(Strings.AppMenuCopyURLConfirmMessage, bottomContainer: self.view)
                 })
             }
         }

Client/Frontend/Browser/TabScrollController.swift

@@ -116,7 +116,7 @@ class TabScrollingController: NSObject {
             completion: completion)
     }
 
-    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
+    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) {
         if keyPath == "contentSize" {
             if !checkScrollHeightIsLargeEnoughForScrolling() && !toolbarsShowing {
                 showToolbars(animated: true, completion: nil)

Client/Frontend/Browser/TabTrayController.swift

@@ -686,7 +686,7 @@ extension TabTrayController: PhotonActionSheetProtocol {
     func didTapDelete(_ sender: UIButton) {
         let controller = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
         controller.addAction(UIAlertAction(title: Strings.AppMenuCloseAllTabsTitleString, style: .default, handler: { _ in self.closeTabsForCurrentTray() }))
-        controller.addAction(UIAlertAction(title: NSLocalizedString("Cancel", comment:"Label for Cancel button"), style: .cancel, handler: nil))
+        controller.addAction(UIAlertAction(title: NSLocalizedString("Cancel", comment: "Label for Cancel button"), style: .cancel, handler: nil))
         controller.popoverPresentationController?.sourceView = sender
         controller.popoverPresentationController?.sourceRect = sender.bounds
         present(controller, animated: true, completion: nil)

Client/Frontend/Browser/TopTabsLayout.swift

@@ -38,7 +38,7 @@ class TopTabsLayoutDelegate: NSObject, UICollectionViewDelegateFlowLayout {
 }
 
 class TopTabsViewLayout: UICollectionViewFlowLayout {
-    var decorationAttributeArr: [Int : UICollectionViewLayoutAttributes?] = [:]
+    var decorationAttributeArr: [Int: UICollectionViewLayoutAttributes?] = [:]
     let separatorYOffset = TopTabsUX.SeparatorYOffset
     let separatorSize = TopTabsUX.SeparatorHeight
     let SeparatorZIndex = -2 ///Prevent the header/footer from appearing above the Tabs

Client/Frontend/Browser/TopTabsViews.swift

@@ -74,8 +74,8 @@ class TopTabCell: UICollectionViewCell {
 
     var selectedTab = false {
         didSet {
-            backgroundColor = selectedTab ? UIColor(rgb:0xf9f9fa) : UIColor(rgb: 0x272727)
-            titleText.textColor = selectedTab ? UIColor(rgb:0x0c0c0d) : UIColor(rgb: 0xb1b1b3)
+            backgroundColor = selectedTab ? UIColor(rgb: 0xf9f9fa) : UIColor(rgb: 0x272727)
+            titleText.textColor = selectedTab ? UIColor(rgb: 0x0c0c0d) : UIColor(rgb: 0xb1b1b3)
             highlightLine.isHidden = !selectedTab
             closeButton.tintColor = selectedTab ? UIColor(rgb: 0x272727) : UIColor(rgb: 0xb1b1b3)
             // restyle if we are in PBM
@@ -122,7 +122,7 @@ class TopTabCell: UICollectionViewCell {
 
     let highlightLine: UIView = {
         let line = UIView()
-        line.backgroundColor = UIColor(rgb:0x0066DC)
+        line.backgroundColor = UIColor(rgb: 0x0066DC)
         line.isHidden = true
         return line
     }()
@@ -173,7 +173,7 @@ class TopTabCell: UICollectionViewCell {
         case Style.light:
             titleText.textColor = UIColor.darkText
             backgroundColor = UIConstants.AppBackgroundColor
-            highlightLine.backgroundColor = UIColor(rgb:0x0066DC)
+            highlightLine.backgroundColor = UIColor(rgb: 0x0066DC)
         case Style.dark:
             titleText.textColor = UIColor.lightText
             backgroundColor = UIColor(rgb: 0x38383D)

Client/Frontend/Browser/URLBarView.swift

@@ -673,7 +673,7 @@ extension URLBarView: Themeable {
 
         let isPrivate = themeName == Theme.PrivateMode
 
-        progressBar.setGradientColors(startColor: UIConstants.LoadingStartColor.color(isPBM: isPrivate), endColor:UIConstants.LoadingEndColor.color(isPBM: isPrivate))
+        progressBar.setGradientColors(startColor: UIConstants.LoadingStartColor.color(isPBM: isPrivate), endColor: UIConstants.LoadingEndColor.color(isPBM: isPrivate))
         currentTheme = themeName
         locationBorderColor = theme.borderColor!
         locationActiveBorderColor = theme.activeBorderColor!

Client/Frontend/ContentBlocker/ContentBlockerHelper.swift

@@ -18,7 +18,7 @@ class ContentBlockerHelper {
     fileprivate weak var tab: Tab?
     fileprivate weak var profile: Profile?
 
-    static var blockImagesRule: WKContentRuleList? = nil
+    static var blockImagesRule: WKContentRuleList?
 
     // Raw values are stored to prefs, be careful changing them.
     enum EnabledState: String {
@@ -92,7 +92,7 @@ class ContentBlockerHelper {
             }
         }
 
-        let blockImages = "[{'trigger':{'url-filter':'.*','resource-type':['image']},'action':{'type':'block'}}]".replacingOccurrences(of: "'", with:"\"")
+        let blockImages = "[{'trigger':{'url-filter':'.*','resource-type':['image']},'action':{'type':'block'}}]".replacingOccurrences(of: "'", with: "\"")
         ruleStore.compileContentRuleList(forIdentifier: "images", encodedContentRuleList: blockImages) {
             rule, error in
             assert(rule != nil && error == nil)