SwiftLint fixes part 3

.swiftlint.yml

@@ -19,3 +19,4 @@ type_name:
 
 excluded:
   - .build
+  - scripts/

Sources/Bookmarks/BookmarkListViewModel.swift

@@ -230,7 +230,11 @@ public class BookmarkListViewModel: BookmarkListInteracting, ObservableObject {
 
     public var totalBookmarksCount: Int {
         let countRequest = BookmarkEntity.fetchRequest()
-        countRequest.predicate = NSPredicate(format: "%K == false && %K == NO", #keyPath(BookmarkEntity.isFolder), #keyPath(BookmarkEntity.isPendingDeletion))
+        countRequest.predicate = NSPredicate(
+            format: "%K == false && %K == NO",
+            #keyPath(BookmarkEntity.isFolder),
+            #keyPath(BookmarkEntity.isPendingDeletion)
+        )
 
         return (try? context.count(for: countRequest)) ?? 0
     }

Sources/Bookmarks/BookmarkUtils.swift

@@ -77,7 +77,10 @@ public struct BookmarkUtils {
                                      predicate: NSPredicate = NSPredicate(value: true),
                                      context: NSManagedObjectContext) -> BookmarkEntity? {
         let request = BookmarkEntity.fetchRequest()
-        let urlPredicate = NSPredicate(format: "%K == %@ AND %K == NO", #keyPath(BookmarkEntity.url), url.absoluteString, #keyPath(BookmarkEntity.isPendingDeletion))
+        let urlPredicate = NSPredicate(format: "%K == %@ AND %K == NO",
+                                       #keyPath(BookmarkEntity.url),
+                                       url.absoluteString,
+                                       #keyPath(BookmarkEntity.isPendingDeletion))
         request.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [urlPredicate, predicate])
         request.returnsObjectsAsFaults = false
         request.fetchLimit = 1

Sources/Bookmarks/ImportExport/BookmarkCoreDataImporter.swift

@@ -56,7 +56,11 @@ public class BookmarkCoreDataImporter {
 
     private func bookmarkURLToID(in context: NSManagedObjectContext) throws -> [String: NSManagedObjectID] {
         let fetch = NSFetchRequest<NSFetchRequestResult>(entityName: "BookmarkEntity")
-        fetch.predicate = NSPredicate(format: "%K == false && %K == NO", #keyPath(BookmarkEntity.isFolder), #keyPath(BookmarkEntity.isPendingDeletion))
+        fetch.predicate = NSPredicate(
+            format: "%K == false && %K == NO",
+            #keyPath(BookmarkEntity.isFolder),
+            #keyPath(BookmarkEntity.isPendingDeletion)
+        )
         fetch.resultType = .dictionaryResultType
 
         let idDescription = NSExpressionDescription()

Sources/Bookmarks/MenuBookmarksViewModel.swift

@@ -129,7 +129,11 @@ public class MenuBookmarksViewModel: MenuBookmarksInteracting {
 
     public func favorite(for url: URL) -> BookmarkEntity? {
         BookmarkUtils.fetchBookmark(for: url,
-                                    predicate: NSPredicate(format: "%K != nil AND %K == NO", #keyPath(BookmarkEntity.favoriteFolder), #keyPath(BookmarkEntity.isPendingDeletion)),
+                                    predicate: NSPredicate(
+                                        format: "%K != nil AND %K == NO",
+                                        #keyPath(BookmarkEntity.favoriteFolder),
+                                        #keyPath(BookmarkEntity.isPendingDeletion)
+                                    ),
                                     context: context)
     }
 

Sources/BookmarksTestsUtils/BookmarkTree.swift

@@ -22,7 +22,7 @@ import CoreData
 import Foundation
 import XCTest
 
-// swiftlint:disable line_length
+// swiftlint:disable cyclomatic_complexity function_body_length line_length
 public struct ModifiedAtConstraint {
     var check: (Date?) -> Void
 
@@ -198,6 +198,7 @@ public struct BookmarkTree {
         return (rootFolder, orphans)
     }
 
+    // swiftlint:disable large_tuple
     @discardableResult
     public func createEntitiesForCheckingModifiedAt(in context: NSManagedObjectContext) -> (BookmarkEntity, [BookmarkEntity], [String: ModifiedAtConstraint]) {
         let rootFolder = BookmarkUtils.fetchRootFolder(context)!
@@ -220,6 +221,7 @@ public struct BookmarkTree {
         }
         return (rootFolder, orphans, modifiedAtConstraints)
     }
+    // swiftlint:enable large_tuple
 
     let modifiedAt: Date?
     let modifiedAtConstraint: ModifiedAtConstraint?
@@ -356,4 +358,4 @@ public extension XCTestCase {
         }
     }
 }
-// swiftlint:enable line_length
+// swiftlint:enable cyclomatic_complexity function_body_length line_length

Sources/BrowserServicesKit/Autofill/AutofillUserScript+Email.swift

@@ -77,7 +77,9 @@ extension AutofillUserScript {
             self.emailDelegate?.autofillUserScriptDidRequestUserData(self) { username, _, _, _ in
                 if let username = username {
                     let autogenerated = alias != username && autosave // Only consider private emails as autogenerated
-                    let credentials = AutofillUserScript.IncomingCredentials(username: "\(alias)@\(EmailManager.emailDomain)", password: nil, autogenerated: autogenerated)
+                    let credentials = AutofillUserScript.IncomingCredentials(username: "\(alias)@\(EmailManager.emailDomain)",
+                                                                             password: nil,
+                                                                             autogenerated: autogenerated)
                     let data = DetectedAutofillData(identity: nil, credentials: credentials, creditCard: nil, trigger: .emailProtection)
                     self.vaultDelegate?.autofillUserScript(self, didRequestStoreDataForDomain: domain, data: data)
 

Sources/BrowserServicesKit/Autofill/AutofillUserScript+SecureVault.swift

@@ -21,7 +21,7 @@ import WebKit
 import Common
 import UserScript
 
-// swiftlint:disable file_length
+// swiftlint:disable line_length file_length
 
 public enum RequestVaultCredentialsAction: String, Codable {
     case none
@@ -913,4 +913,4 @@ extension AutofillUserScript.AskToUnlockProviderResponse {
 
 }
 
-// swiftlint:enable file_length
+// swiftlint:enable line_length file_length

Sources/BrowserServicesKit/Autofill/OverlayAutofillUserScript.swift

@@ -26,7 +26,9 @@ public protocol OverlayAutofillUserScriptDelegate: AnyObject {
     /// Represents the last tab host, is used to verify messages origin from and selecting of credentials
     var overlayAutofillUserScriptLastOpenHost: String? { get }
     /// Handles filling the credentials back from the top autofill into the child
-    func overlayAutofillUserScript(_ overlayAutofillUserScript: OverlayAutofillUserScript, messageSelectedCredential: [String: String], _ configType: String)
+    func overlayAutofillUserScript(_ overlayAutofillUserScript: OverlayAutofillUserScript,
+                                   messageSelectedCredential: [String: String],
+                                   _ configType: String)
     /// Closes the overlay
     func overlayAutofillUserScriptClose(_ overlayAutofillUserScript: OverlayAutofillUserScript)
 }

Sources/BrowserServicesKit/Autofill/WebsiteAutofillUserScript.swift

@@ -26,7 +26,10 @@ public protocol ContentOverlayUserScriptDelegate: AnyObject {
     /// Closes the overlay
     func websiteAutofillUserScriptCloseOverlay(_ websiteAutofillUserScript: WebsiteAutofillUserScript?)
     /// Opens the overlay
-    func websiteAutofillUserScript(_ websiteAutofillUserScript: WebsiteAutofillUserScript, willDisplayOverlayAtClick: CGPoint?, serializedInputContext: String, inputPosition: CGRect)
+    func websiteAutofillUserScript(_ websiteAutofillUserScript: WebsiteAutofillUserScript,
+                                   willDisplayOverlayAtClick: CGPoint?,
+                                   serializedInputContext: String,
+                                   inputPosition: CGRect)
 }
 
 public class WebsiteAutofillUserScript: AutofillUserScript {
@@ -131,7 +134,9 @@ public class WebsiteAutofillUserScript: AutofillUserScript {
 
         } else if let selectedDetailsData = selectedDetailsData {
             self.selectedDetailsData = nil
-            response = GetSelectedCredentialsResponse(type: CredentialsResponse.ok, data: selectedDetailsData.data, configType: selectedDetailsData.configType)
+            response = GetSelectedCredentialsResponse(type: CredentialsResponse.ok,
+                                                      data: selectedDetailsData.data,
+                                                      configType: selectedDetailsData.configType)
         }
 
         if let json = try? JSONEncoder().encode(response),
@@ -150,7 +155,9 @@ extension WebsiteAutofillUserScript: OverlayAutofillUserScriptDelegate {
         close()
     }
 
-    public func overlayAutofillUserScript(_ overlayAutofillUserScript: OverlayAutofillUserScript, messageSelectedCredential: [String: String], _ configType: String) {
+    public func overlayAutofillUserScript(_ overlayAutofillUserScript: OverlayAutofillUserScript,
+                                          messageSelectedCredential: [String: String],
+                                          _ configType: String) {
         guard let currentOverlayTab = currentOverlayTab else { return }
         currentOverlayTab.websiteAutofillUserScriptCloseOverlay(self)
         selectedDetailsData = SelectedDetailsData(data: messageSelectedCredential, configType: configType)

Sources/BrowserServicesKit/ContentBlocking/AdClickAttribution/AdClickAttributionEvents.swift

@@ -33,8 +33,6 @@ public enum AdClickAttributionEvents {
     case adAttributionPageLoads
 }
 
-// swiftlint:disable identifier_name
-
 public enum AdClickAttributionDebugEvents {
 
     case adAttributionGlobalAttributedRulesDoNotExist
@@ -49,5 +47,3 @@ public enum AdClickAttributionDebugEvents {
     case adAttributionDetectionHeuristicsDidNotMatchDomain
 
 }
-
-// swiftlint:enable identifier_name

Sources/BrowserServicesKit/ContentBlocking/AdClickAttribution/AdClickAttributionLogic.swift

@@ -28,6 +28,7 @@ public protocol AdClickAttributionLogicDelegate: AnyObject {
                           forVendor vendor: String?)
 }
 
+// swiftlint:disable:next type_body_length
 public class AdClickAttributionLogic {
 
     public enum State {

Sources/BrowserServicesKit/ContentBlocking/ContentBlockerRulesManager.swift

@@ -23,8 +23,7 @@ import TrackerRadarKit
 import Combine
 import Common
 
-// swiftlint:disable file_length
-// swiftlint:disable type_body_length
+// swiftlint:disable file_length type_body_length
 
 public protocol CompiledRuleListsSource {
 
@@ -337,11 +336,9 @@ public class ContentBlockerRulesManager: CompiledRuleListsSource {
         var cnames = [TrackerData.CnameDomain: TrackerData.TrackerDomain]()
         if let tdsCnames = tds.cnames {
             for pair in tdsCnames {
-                for domain in domains.keys {
-                    if pair.value.hasSuffix(domain) {
-                        cnames[pair.key] = pair.value
-                        break
-                    }
+                for domain in domains.keys where pair.value.hasSuffix(domain) {
+                    cnames[pair.key] = pair.value
+                    break
                 }
             }
         }
@@ -450,3 +447,5 @@ public class ContentBlockerRulesManager: CompiledRuleListsSource {
     }
 
 }
+
+// swiftlint:enable file_length type_body_length

Sources/BrowserServicesKit/ContentBlocking/UserScripts/ContentBlockerRulesUserScript.swift

@@ -112,6 +112,7 @@ open class ContentBlockerRulesUserScript: NSObject, UserScript {
         return temporaryUnprotectedDomains
     }
 
+    // swiftlint:disable:next cyclomatic_complexity function_body_length
     public func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
         guard let delegate = delegate else { return }
         guard delegate.contentBlockerRulesUserScriptShouldProcessTrackers(self) else { return }

Sources/BrowserServicesKit/Email/EmailManager.swift

@@ -74,14 +74,12 @@ public enum EmailManagerPermittedAddressType {
     case none
 }
 
-// swiftlint:disable identifier_name
 public protocol EmailManagerAliasPermissionDelegate: AnyObject {
 
     func emailManager(_ emailManager: EmailManager,
                       didRequestPermissionToProvideAliasWithCompletion: @escaping (EmailManagerPermittedAddressType, _ autosave: Bool) -> Void)
 
 }
-// swiftlint:enable identifier_name
 
 public enum EmailManagerRequestDelegateError: Error {
     case serverError(statusCode: Int)
@@ -648,7 +646,10 @@ private extension EmailManager {
                                                               requested: url,
                                                               method: Constants.RequestMethods.put,
                                                               headers: emailHeaders,
-                                                              parameters: [Constants.RequestParameters.address: alias, Constants.RequestParameters.status: "\(active)"],
+                                                              parameters: [
+                                                                Constants.RequestParameters.address: alias,
+                                                                Constants.RequestParameters.status: "\(active)"
+                                                              ],
                                                               httpBody: nil,
                                                               timeoutInterval: timeoutInterval)
             let response: EmailAliasStatusResponse = try JSONDecoder().decode(EmailAliasStatusResponse.self, from: data)

Sources/BrowserServicesKit/FeatureFlagger/FeatureFlagger.swift

@@ -67,24 +67,26 @@ public class DefaultFeatureFlagger: FeatureFlagger {
 /// where the final value should come from.
 ///
 /// Example:
-//
-// public enum FeatureFlag: FeatureFlagSourceProviding {
-//    case sync
-//    case autofill
-//    case cookieConsent
-//    case duckPlayer
-//
-//    var source: FeatureFlagSource {
-//        case .sync:
-//            return .disabled
-//        case .cookieConsent:
-//            return .internalOnly
-//        case .credentialsAutofill:
-//            return .remoteDevelopment(.subfeature(AutofillSubfeature.credentialsAutofill))
-//        case .duckPlayer:
-//            return .remoteReleasable(.feature(.duckPlayer))
-//    }
-// }
+///
+/// ```
+/// public enum FeatureFlag: FeatureFlagSourceProviding {
+///    case sync
+///    case autofill
+///    case cookieConsent
+///    case duckPlayer
+///
+///    var source: FeatureFlagSource {
+///        case .sync:
+///            return .disabled
+///        case .cookieConsent:
+///            return .internalOnly
+///        case .credentialsAutofill:
+///            return .remoteDevelopment(.subfeature(AutofillSubfeature.credentialsAutofill))
+///        case .duckPlayer:
+///            return .remoteReleasable(.feature(.duckPlayer))
+///    }
+/// }
+/// ```
 public protocol FeatureFlagSourceProviding {
     var source: FeatureFlagSource { get }
 }

Sources/BrowserServicesKit/GPC/GPCRequestFactory.swift

@@ -52,8 +52,8 @@ public struct GPCRequestFactory {
     }
 
     public func requestForGPC(basedOn incomingRequest: URLRequest,
-                       config: PrivacyConfiguration,
-                       gpcEnabled: Bool) -> URLRequest? {
+                              config: PrivacyConfiguration,
+                              gpcEnabled: Bool) -> URLRequest? {
 
         func removingHeader(fromRequest incomingRequest: URLRequest) -> URLRequest? {
             var request = incomingRequest

Sources/BrowserServicesKit/LinkProtection/AMPCanonicalExtractor.swift

@@ -118,14 +118,10 @@ public class AMPCanonicalExtractor: NSObject {
         let urlStr = url.absoluteString
 
         let ampKeywords = TrackingLinkSettings(fromConfig: privacyConfig).ampKeywords
-
-        for keyword in ampKeywords {
-            if urlStr.contains(keyword) {
-                return true
-            }
+
+        return ampKeywords.contains { keyword in
+            return urlStr.contains(keyword)
         }
-
-        return false
     }
 
     private func buildUserScript() -> WKUserScript {

Sources/BrowserServicesKit/LinkProtection/LinkCleaner.swift

@@ -33,10 +33,8 @@ public class LinkCleaner {
 
     public func ampFormat(matching url: URL) -> String? {
         let ampFormats = TrackingLinkSettings(fromConfig: privacyConfig).ampLinkFormats
-        for format in ampFormats {
-            if url.absoluteString.matches(pattern: format) {
-                return format
-            }
+        for format in ampFormats where url.absoluteString.matches(pattern: format) {
+            return format
         }
 
         return nil

Sources/BrowserServicesKit/LinkProtection/LinkProtection.swift

@@ -123,7 +123,12 @@ public struct LinkProtection {
                                            onFinishExtracting: @escaping () -> Void,
                                            onLinkRewrite: @escaping (URL, WKNavigationAction) -> Void,
                                            policyDecisionHandler: @escaping (WKNavigationActionPolicy) -> Void) -> Bool {
-        requestTrackingLinkRewrite(initiatingURL: initiatingURL, destinationURL: navigationAction.request.url!, onStartExtracting: onStartExtracting, onFinishExtracting: onFinishExtracting, onLinkRewrite: { onLinkRewrite($0, navigationAction) }, policyDecisionHandler: { policyDecisionHandler($0 ? .allow : .cancel) })
+        requestTrackingLinkRewrite(initiatingURL: initiatingURL,
+                                   destinationURL: navigationAction.request.url!,
+                                   onStartExtracting: onStartExtracting,
+                                   onFinishExtracting: onFinishExtracting,
+                                   onLinkRewrite: { onLinkRewrite($0, navigationAction) },
+                                   policyDecisionHandler: { policyDecisionHandler($0 ? .allow : .cancel) })
     }
     // swiftlint:enable function_parameter_count
 

Sources/BrowserServicesKit/PrivacyConfig/AppPrivacyConfiguration.swift

@@ -98,8 +98,8 @@ public struct AppPrivacyConfiguration: PrivacyConfiguration {
     }
 
     private func isRolloutEnabled(subfeature: any PrivacySubfeature,
-                                rollouts: [PrivacyConfigurationData.PrivacyFeature.Feature.Rollout],
-                                randomizer: (Range<Double>) -> Double) -> Bool {
+                                  rollouts: [PrivacyConfigurationData.PrivacyFeature.Feature.Rollout],
+                                  randomizer: (Range<Double>) -> Double) -> Bool {
         // Empty rollouts should be default enabled
         guard !rollouts.isEmpty else { return true }
 
@@ -139,7 +139,9 @@ public struct AppPrivacyConfiguration: PrivacyConfiguration {
         return true
     }
 
-    public func isSubfeatureEnabled(_ subfeature: any PrivacySubfeature, versionProvider: AppVersionProvider, randomizer: (Range<Double>) -> Double) -> Bool {
+    public func isSubfeatureEnabled(_ subfeature: any PrivacySubfeature,
+                                    versionProvider: AppVersionProvider,
+                                    randomizer: (Range<Double>) -> Double) -> Bool {
         guard isEnabled(featureKey: subfeature.parent, versionProvider: versionProvider) else {
             return false
         }

Sources/BrowserServicesKit/PrivacyConfig/PrivacyConfigurationData.swift

@@ -176,7 +176,12 @@ public struct PrivacyConfigurationData {
             self.hash = json[CodingKeys.hash.rawValue] as? String
         }
 
-        public init(state: FeatureState, exceptions: [ExceptionEntry], settings: [String: Any] = [:], features: Features = [:], minSupportedVersion: String? = nil, hash: String? = nil) {
+        public init(state: FeatureState,
+                    exceptions: [ExceptionEntry],
+                    settings: [String: Any] = [:],
+                    features: Features = [:],
+                    minSupportedVersion: String? = nil,
+                    hash: String? = nil) {
             self.state = state
             self.exceptions = exceptions
             self.settings = settings