Turn SwiftLint back on (#738)

* Uncomment the SwiftLint script.

* Ignore comments for line length warnings.

Xcode’s font used for comments is not monospaced, so comments can hit this limit very easily even though they don’t take up much horizontal space.

* Fix all SwiftLint warnings.

* Introduce some deliberate SwiftLint violations.

* Revert deliberate SwiftLint violations, CI failed successfully.

Author: samsymons

.swiftlint.yml

@@ -3,7 +3,9 @@ disabled_rules:
   - trailing_whitespace
 
 # Rule Config
-line_length: 150
+line_length:
+  warning: 150
+  ignores_comments: true
 identifier_name:
   min_length: 1
   max_length:

Core/ContentBlockerRulesManager.swift

@@ -17,7 +17,6 @@
 //  limitations under the License.
 //
 
-
 import Foundation
 import WebKit
 import os.log
@@ -50,7 +49,8 @@ public class ContentBlockerRulesManager {
         }
 
         if let store = WKContentRuleListStore.default() {
-            store.compileContentRuleList(forIdentifier: "tds", encodedContentRuleList: String(data: data, encoding: .utf8)!) { [weak self] ruleList, error in
+            let ruleList = String(data: data, encoding: .utf8)!
+            store.compileContentRuleList(forIdentifier: "tds", encodedContentRuleList: ruleList) { [weak self] ruleList, error in
                 self?.blockingRules = ruleList
                 completion?(ruleList)
                 if let error = error {

Core/ContentBlockerRulesUserScript.swift

@@ -34,7 +34,7 @@ public class ContentBlockerRulesUserScript: NSObject, UserScript {
             + (storageCache?.fileStore.loadAsString(forConfiguration: .temporaryUnprotectedSites) ?? "")
 
         return loadJS("contentblockerrules", withReplacements: [
-            "${unprotectedDomains}": unprotectedDomains,
+            "${unprotectedDomains}": unprotectedDomains
         ])
     }
 

Core/DoNotSellUserScript.swift

@@ -1,21 +1,21 @@
- //
- //  DoNotSellUserScript.swift
- //  DuckDuckGo
- //
- //  Copyright © 2020 DuckDuckGo. All rights reserved.
- //
- //  Licensed under the Apache License, Version 2.0 (the "License");
- //  you may not use this file except in compliance with the License.
- //  You may obtain a copy of the License at
- //
- //  http://www.apache.org/licenses/LICENSE-2.0
- //
- //  Unless required by applicable law or agreed to in writing, software
- //  distributed under the License is distributed on an "AS IS" BASIS,
- //  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- //  See the License for the specific language governing permissions and
- //  limitations under the License.
- //
+//
+//  DoNotSellUserScript.swift
+//  DuckDuckGo
+//
+//  Copyright © 2020 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
 
 import UIKit
 import WebKit

Core/NavigatorSharePatchUserScript.swift

@@ -34,6 +34,5 @@ public class NavigatorSharePatchUserScript: NSObject, UserScript {
     public func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
 
     }
-    
 
 }

Core/Pixel.swift

@@ -20,6 +20,7 @@
 import Foundation
 import os.log
 
+// swiftlint:disable identifier_name
 public enum PixelName: String {
 
     case appLaunch = "ml"
@@ -237,6 +238,7 @@ public enum PixelName: String {
 
     case backgroundTaskSubmissionFailed = "m_bt_rf"
 }
+// swiftlint:enable identifier_name
 
 public struct PixelParameters {
     public static let url = "url"

Core/VariantManager.swift

@@ -35,7 +35,7 @@ public struct Variant {
         static let notPadDevice = { return !Self.padDevice() }
 
         static let inRequiredCountry = { return ["AU", "AT", "DK", "FI", "FR", "DE", "IT", "IE", "NZ", "NO", "ES", "SE", "GB"]
-                .contains(where: { Locale.current.regionCode == $0 } ) }
+                .contains(where: { Locale.current.regionCode == $0 }) }
     }
 
     static let doNotAllocate = 0
@@ -46,7 +46,7 @@ public struct Variant {
         // SERP testing
         Variant(name: "sc", weight: 1, isIncluded: When.inRequiredCountry, features: []),
         Variant(name: "sd", weight: doNotAllocate, isIncluded: When.always, features: []),
-        Variant(name: "se", weight: 1, isIncluded: When.inRequiredCountry, features: []),
+        Variant(name: "se", weight: 1, isIncluded: When.inRequiredCountry, features: [])
 
     ]
 

DuckDuckGo.xcodeproj/project.pbxproj

@@ -3588,7 +3588,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# if which swiftlint >/dev/null; then\n#    if [ ! -z \"$BITRISE_PROJECT_PATH\" ] || [ \"$CONFIGURATION\" = \"Release\" ]; then\n#        swiftlint lint --strict\n#        if [ $? -ne 0 ]; then\n#            echo \"error: SwiftLint validation failed.\"\n#            exit 1\n#        fi\n#    else\n#        swiftlint lint\n#    fi\n# else\n#    echo \"error: SwiftLint not installed. Install using \\`brew install swiftlint\\`\"\n#    exit 1\n# fi\n";
+			shellScript = "if which swiftlint >/dev/null; then\n   if [ ! -z \"$BITRISE_PROJECT_PATH\" ] || [ \"$CONFIGURATION\" = \"Release\" ]; then\n       swiftlint lint --strict\n       if [ $? -ne 0 ]; then\n           echo \"error: SwiftLint validation failed.\"\n           exit 1\n       fi\n   else\n       swiftlint lint\n   fi\nelse\n   echo \"error: SwiftLint not installed. Install using \\`brew install swiftlint\\`\"\n   exit 1\nfi\n";
 		};
 		85F4D03A1F44A7BE0018BFD5 /* Install Fonts */ = {
 			isa = PBXShellScriptBuildPhase;

DuckDuckGo/DaxDialogs.swift

@@ -232,7 +232,9 @@ class DaxDialogs {
 
         default:
             settings.browsingWithTrackersShown = true
-            return BrowsingSpec.withMutipleTrackers.format(args: entitiesBlocked.count - 2, entitiesBlocked[0].displayName ?? "", entitiesBlocked[1].displayName ?? "")
+            return BrowsingSpec.withMutipleTrackers.format(args: entitiesBlocked.count - 2,
+                                                           entitiesBlocked[0].displayName ?? "",
+                                                           entitiesBlocked[1].displayName ?? "")
         }
 
     }

DuckDuckGo/DoNotSellSettingsViewController.swift

@@ -92,7 +92,7 @@ extension DoNotSellSettingsViewController: Themable {
                                           attributes: [
                                             NSAttributedString.Key.link: "ddgQuickLink://duckduckgo.com/global-privacy-control-learn-more"
                                           ]))
-        let linkAttributes: [NSAttributedString.Key : Any] = [
+        let linkAttributes: [NSAttributedString.Key: Any] = [
             NSAttributedString.Key.kern: -0.08,
             NSAttributedString.Key.paragraphStyle: paragraphStyle,
             NSAttributedString.Key.font: UIFont.systemFont(ofSize: 13),