duckduckgo · federicocappelli · Jul 9, 2024 · Jul 9, 2024 · Jul 9, 2024 · Jul 9, 2024
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -9,10 +9,13 @@ disabled_rules:
   - line_length
   - type_name
   - implicit_getter
-  - function_parameter_count
   - trailing_comma
   - nesting
   - opening_brace
+  - function_parameter_count
+  - function_body_length
+  - file_length
+  - type_body_length
 
 opt_in_rules:
   - file_header
@@ -40,15 +43,11 @@ analyzer_rules: # Rules run by `swiftlint analyze`
   - explicit_self
 
 # Rule Config
+cyclomatic_complexity:
+  ignores_case_statements: true
 identifier_name:
   min_length: 1
   max_length: 1000
-file_length:
-  warning: 1200
-  error: 1200
-type_body_length:
-  warning: 500
-  error: 500
 large_tuple:
   warning: 4
   error: 5

diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/BrowserServicesKit-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/BrowserServicesKit-Package.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1540"
-   version = "1.8">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES"
@@ -385,6 +385,34 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BrowserServicesKitTestsUtils"
+               BuildableName = "BrowserServicesKitTestsUtils"
+               BlueprintName = "BrowserServicesKitTestsUtils"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "RemoteMessagingTestsUtils"
+               BuildableName = "RemoteMessagingTestsUtils"
+               BlueprintName = "RemoteMessagingTestsUtils"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction

diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/SubscriptionTests.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/SubscriptionTests.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1540"
-   version = "1.8">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES"

diff --git a/Plugins/SwiftLintPlugin/SwiftLintPlugin.swift b/Plugins/SwiftLintPlugin/SwiftLintPlugin.swift
@@ -49,7 +49,6 @@ struct SwiftLintPlugin: BuildToolPlugin {
         )
     }
 
-    // swiftlint:disable function_body_length
     private func createBuildCommands(
         target: String,
         inputFiles: [Path],
@@ -184,8 +183,6 @@ struct SwiftLintPlugin: BuildToolPlugin {
 
         return result
     }
-    // swiftlint:enable function_body_length
-
 }
 
 #if canImport(XcodeProjectPlugin)

diff --git a/Sources/BookmarksTestDBBuilder/BookmarksTestDBBuilder.swift b/Sources/BookmarksTestDBBuilder/BookmarksTestDBBuilder.swift
@@ -22,7 +22,6 @@ import Persistence
 import Bookmarks
 
 // swiftlint:disable force_try
-// swiftlint:disable function_body_length
 
 @main
 struct BookmarksTestDBBuilder {
@@ -255,7 +254,6 @@ public extension BookmarkEntity {
         makeWithModifiedAtConstraints(with: treeNode, rootFolder: rootFolder, favoritesFolders: favoritesFolders, in: context)
     }
 
-    // swiftlint:disable:next cyclomatic_complexity
     @discardableResult static func makeWithModifiedAtConstraints(with treeNode: BookmarkTreeNode, rootFolder: BookmarkEntity, favoritesFolders: [BookmarkEntity], in context: NSManagedObjectContext) -> BookmarkEntity {
         var entity: BookmarkEntity!
 
@@ -319,4 +317,3 @@ public extension BookmarkEntity {
 }
 
 // swiftlint:enable force_try
-// swiftlint:enable function_body_length
diff --git a/Sources/BookmarksTestsUtils/BookmarkTree.swift b/Sources/BookmarksTestsUtils/BookmarkTree.swift
@@ -21,7 +21,6 @@ import CoreData
 import Foundation
 import XCTest
 
-// swiftlint:disable cyclomatic_complexity function_body_length
 public struct ModifiedAtConstraint {
     var check: (Date?) -> Void
 
@@ -261,12 +260,19 @@ public struct BookmarkTree {
 
 public extension BookmarkEntity {
     @discardableResult
-    static func make(with treeNode: BookmarkTreeNode, rootFolder: BookmarkEntity, favoritesFolders: [BookmarkEntity], in context: NSManagedObjectContext) -> BookmarkEntity {
+    static func make(with treeNode: BookmarkTreeNode,
+                     rootFolder: BookmarkEntity,
+                     favoritesFolders: [BookmarkEntity],
+                     in context: NSManagedObjectContext) -> BookmarkEntity {
         makeWithModifiedAtConstraints(with: treeNode, rootFolder: rootFolder, favoritesFolders: favoritesFolders, in: context).0
     }
 
     @discardableResult
-    static func makeWithModifiedAtConstraints(with treeNode: BookmarkTreeNode, rootFolder: BookmarkEntity, favoritesFolders: [BookmarkEntity], in context: NSManagedObjectContext) -> (BookmarkEntity, [String: ModifiedAtConstraint]) {
+    // swiftlint:disable:next cyclomatic_complexity
+    static func makeWithModifiedAtConstraints(with treeNode: BookmarkTreeNode,
+                                              rootFolder: BookmarkEntity,
+                                              favoritesFolders: [BookmarkEntity],
+                                              in context: NSManagedObjectContext) -> (BookmarkEntity, [String: ModifiedAtConstraint]) {
         var entity: BookmarkEntity!
 
         var queues: [[BookmarkTreeNode]] = [[treeNode]]
@@ -405,4 +411,3 @@ public extension XCTestCase {
         }
     }
 }
-// swiftlint:enable cyclomatic_complexity function_body_length
diff --git a/Sources/BrowserServicesKit/Autofill/AutofillUserScript.swift b/Sources/BrowserServicesKit/Autofill/AutofillUserScript.swift
@@ -113,7 +113,6 @@ public class AutofillUserScript: NSObject, UserScript, UserScriptMessageEncrypti
         return jsonString
     }()
 
-    // swiftlint:disable:next cyclomatic_complexity
     public func messageHandlerFor(_ messageName: String) -> MessageHandler? {
         guard let message = MessageName(rawValue: messageName) else {
             os_log("Failed to parse Autofill User Script message: '%{public}s'", log: .userScripts, type: .debug, messageName)

diff --git a/Sources/BrowserServicesKit/ContentBlocking/UserScripts/ContentBlockerRulesUserScript.swift b/Sources/BrowserServicesKit/ContentBlocking/UserScripts/ContentBlockerRulesUserScript.swift
@@ -118,7 +118,7 @@ open class ContentBlockerRulesUserScript: NSObject, UserScript {
         return temporaryUnprotectedDomains
     }
 
-    // swiftlint:disable:next cyclomatic_complexity function_body_length
+    // swiftlint:disable:next cyclomatic_complexity
     public func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
         guard let delegate = delegate else { return }
         guard delegate.contentBlockerRulesUserScriptShouldProcessTrackers(self) else { return }

diff --git a/Sources/BrowserServicesKit/Email/EmailManager.swift b/Sources/BrowserServicesKit/Email/EmailManager.swift
@@ -88,7 +88,6 @@ public enum EmailManagerRequestDelegateError: Error {
     case decodingError
 }
 
-// swiftlint:disable function_parameter_count
 public protocol EmailManagerRequestDelegate: AnyObject {
 
     var activeTask: URLSessionTask? { get set }
@@ -106,7 +105,6 @@ public protocol EmailManagerRequestDelegate: AnyObject {
                                           error: EmailKeychainAccessError)
 
 }
-// swiftlint:enable function_parameter_count
 
 public extension Notification.Name {
     static let emailDidSignIn = Notification.Name("com.duckduckgo.browserServicesKit.EmailDidSignIn")

diff --git a/Sources/BrowserServicesKit/LinkProtection/LinkProtection.swift b/Sources/BrowserServicesKit/LinkProtection/LinkProtection.swift
@@ -91,7 +91,6 @@ public struct LinkProtection {
         }
     }
 
-    // swiftlint:disable function_parameter_count
     public func requestTrackingLinkRewrite(initiatingURL: URL?,
                                            destinationRequest: URLRequest,
                                            onStartExtracting: () -> Void,
@@ -147,7 +146,6 @@ public struct LinkProtection {
                                    onLinkRewrite: { onLinkRewrite($0, navigationAction) },
                                    policyDecisionHandler: { policyDecisionHandler($0 ? .allow : .cancel) })
     }
-    // swiftlint:enable function_parameter_count
 
     @MainActor
     public func requestTrackingLinkRewrite(initiatingURL: URL?,

diff --git a/Sources/BrowserServicesKit/SecureVault/AutofillDatabaseProvider.swift b/Sources/BrowserServicesKit/SecureVault/AutofillDatabaseProvider.swift
@@ -21,8 +21,6 @@ import Foundation
 import GRDB
 import SecureStorage
 
-// swiftlint:disable file_length
-
 public protocol AutofillDatabaseProvider: SecureStorageDatabaseProvider {
 
     func accounts() throws -> [SecureVaultModels.WebsiteAccount]
@@ -825,7 +823,6 @@ extension DefaultAutofillDatabaseProvider {
 
     }
 
-    // swiftlint:disable:next function_body_length
     static func migrateV6(database: Database) throws {
 
         try database.alter(table: SecureVaultModels.Identity.databaseTableName) {
@@ -1366,5 +1363,3 @@ extension SecureVaultModels.Identity: PersistableRecord, FetchableRecord {
     public static var databaseTableName: String = "identities"
 
 }
-
-// swiftlint:enable file_length
diff --git a/Sources/BrowserServicesKit/SecureVault/SecureVaultManager.swift b/Sources/BrowserServicesKit/SecureVault/SecureVaultManager.swift
@@ -201,7 +201,7 @@ extension SecureVaultManager: AutofillSecureVaultDelegate {
         delegate?.secureVaultManager(self, didRequestPasswordManagerForDomain: domain)
     }
 
-    // swiftlint:disable:next cyclomatic_complexity function_body_length
+    // swiftlint:disable:next cyclomatic_complexity
     public func autofillUserScript(_: AutofillUserScript,
                                    didRequestStoreDataForDomain domain: String,
                                    data: AutofillUserScript.DetectedAutofillData) {
@@ -338,7 +338,6 @@ extension SecureVaultManager: AutofillSecureVaultDelegate {
 
     }
 
-    // swiftlint:disable function_body_length
     public func autofillUserScript(_: AutofillUserScript,
                                    didRequestCredentialsForDomain domain: String,
                                    subType: AutofillUserScript.GetAutofillDataSubType,
@@ -404,7 +403,6 @@ extension SecureVaultManager: AutofillSecureVaultDelegate {
             completionHandler(nil, credentialsProvider, .none)
         }
     }
-    // swiftlint:enable function_body_length
 
     public func autofillUserScript(_: AutofillUserScript,
                                    didRequestCredentialsForAccount accountId: String,

diff --git a/Sources/BrowserServicesKitTestsUtils/MockEmailManagerRequestDelegate.swift b/Sources/BrowserServicesKitTestsUtils/MockEmailManagerRequestDelegate.swift
@@ -30,14 +30,12 @@ public class MockEmailManagerRequestDelegate: EmailManagerRequestDelegate {
     public var waitlistTimestamp: Int = 1
     public var didSendMockAliasRequest: () -> Void
 
-    // swiftlint:disable function_parameter_count
     public func emailManager(_ emailManager: EmailManager, requested url: URL, method: String, headers: [String: String], parameters: [String: String]?, httpBody: Data?, timeoutInterval: TimeInterval) async throws -> Data {
         switch url.absoluteString {
         case EmailUrls.Url.emailAlias: return try processMockAliasRequest().get()
         default: fatalError("\(#file): Unsupported URL passed to mock request delegate: \(url)")
         }
     }
-    // swiftlint:enable function_parameter_count
 
     public var keychainAccessErrorAccessType: EmailKeychainAccessType?
     public var keychainAccessError: EmailKeychainAccessError?

diff --git a/Sources/Common/Logging.swift b/Sources/Common/Logging.swift
@@ -111,8 +111,6 @@ extension ProcessInfo {
     }
 }
 
-// swiftlint:disable function_parameter_count
-
 // MARK: - message first
 
 @inlinable
@@ -326,5 +324,3 @@ public func os_log(_ type: OSLogType, _ message: @autoclosure () -> String, _ vi
 public func os_log(_ message: @autoclosure () -> String, _ visibility: LogVisibility = .private) {
     os_log(.default, log: .default, message(), visibility)
 }
-
-// swiftlint:enable function_parameter_count
diff --git a/Sources/DDGSync/DDGSync.swift b/Sources/DDGSync/DDGSync.swift
@@ -242,7 +242,6 @@ public class DDGSync: DDGSyncing {
         }
     }
 
-    // swiftlint:disable:next function_body_length
     private func updateAccount(_ account: SyncAccount? = nil) throws {
         guard account?.state != .initializing else {
             assertionFailure("Sync has not been initialized properly")

diff --git a/Sources/DDGSync/internal/RemoteAPIRequestCreator.swift b/Sources/DDGSync/internal/RemoteAPIRequestCreator.swift
@@ -26,7 +26,6 @@ struct RemoteAPIRequestCreator: RemoteAPIRequestCreating {
         self.getLog = log
     }
 
-    // swiftlint:disable:next function_parameter_count
     public func createRequest(
         url: URL,
         method: HTTPRequestMethod,

diff --git a/Sources/DDGSync/internal/SyncDependencies.swift b/Sources/DDGSync/internal/SyncDependencies.swift
@@ -97,7 +97,6 @@ protocol HTTPRequesting {
 }
 
 protocol RemoteAPIRequestCreating {
-    // swiftlint:disable:next function_parameter_count
     func createRequest(url: URL,
                        method: HTTPRequestMethod,
                        headers: [String: String],

diff --git a/Sources/DDGSync/internal/SyncOperation.swift b/Sources/DDGSync/internal/SyncOperation.swift
@@ -125,7 +125,6 @@ final class SyncOperation: Operation, @unchecked Sendable {
         try await sync(fetchOnly: fetchOnly, dataProviders: dataProviders)
     }
 
-    // swiftlint:disable:next cyclomatic_complexity function_body_length
     func sync(fetchOnly: Bool, dataProviders: [DataProviding] = []) async throws {
         os_log(.debug, log: log, "Sync Operation Started. Fetch-only: %{public}s", String(fetchOnly))
         defer {

diff --git a/Sources/History/HistoryStore.swift b/Sources/History/HistoryStore.swift
@@ -168,7 +168,6 @@ final public class HistoryStore: HistoryStoring {
         }
     }
 
-    // swiftlint:disable:next function_body_length
     public func save(entry: HistoryEntry) -> Future<[(id: Visit.ID, date: Date)], Error> {
         return Future { [weak self] promise in
             self?.context.perform { [weak self] in

diff --git a/Sources/Navigation/DistributedNavigationDelegate.swift b/Sources/Navigation/DistributedNavigationDelegate.swift
@@ -109,7 +109,6 @@ private extension DistributedNavigationDelegate {
     static var sigIntRaisedForResponders = Set<String>()
 #endif
 
-    // swiftlint:disable function_parameter_count
     /// continues until first non-nil Navigation Responder decision and returned to the `completion` callback
     func makeAsyncDecision<T>(for actionDebugInfo: some CustomDebugStringConvertible,
                               boundToLifetimeOf webView: WKWebView,
@@ -170,7 +169,6 @@ private extension DistributedNavigationDelegate {
 
         return task
     }
-    // swiftlint:enable function_parameter_count
 
     func makeAsyncDecision<T>(for actionDebugInfo: some CustomDebugStringConvertible,
                               boundToLifetimeOf webView: WKWebView,
@@ -310,8 +308,7 @@ extension DistributedNavigationDelegate: WKNavigationDelegate {
     // MARK: Policy making
 
     @MainActor
-    // swiftlint:disable function_body_length
-    // swiftlint:disable cyclomatic_complexity
+    // swiftlint:disable:next cyclomatic_complexity
     public func webView(_ webView: WKWebView, decidePolicyFor wkNavigationAction: WKNavigationAction, preferences wkPreferences: WKWebpagePreferences, decisionHandler: @escaping (WKNavigationActionPolicy, WKWebpagePreferences) -> Void) {
 
         // new navigation or an ongoing navigation (for a server-redirect)?
@@ -432,8 +429,6 @@ extension DistributedNavigationDelegate: WKNavigationDelegate {
             self.navigationActionDecisionTask = task
         }
     }
-    // swiftlint:enable function_body_length
-    // swiftlint:enable cyclomatic_complexity
 
     @MainActor
     private func willStart(_ navigation: Navigation) {
@@ -643,10 +638,9 @@ extension DistributedNavigationDelegate: WKNavigationDelegate {
 
 #if WILLPERFORMCLIENTREDIRECT_ENABLED
 
-    // swiftlint:disable function_body_length
-    // swiftlint:disable cyclomatic_complexity
     @MainActor
     @objc(_webView:willPerformClientRedirectToURL:delay:)
+    // swiftlint:disable:next cyclomatic_complexity
     public func webView(_ webView: WKWebView, willPerformClientRedirectTo url: URL, delay: TimeInterval) {
         for responder in responders {
             responder.webViewWillPerformClientRedirect(to: url, withDelay: delay)
@@ -742,8 +736,6 @@ extension DistributedNavigationDelegate: WKNavigationDelegate {
         // set Navigation state to .redirected and expect the redirect NavigationAction
         redirectedNavigation.willPerformClientRedirect(to: url, delay: delay)
     }
-    // swiftlint:enable function_body_length
-    // swiftlint:enable cyclomatic_complexity
 
     @MainActor
     @objc(_webViewDidCancelClientRedirect:)

diff --git a/Sources/Navigation/NavigationState.swift b/Sources/Navigation/NavigationState.swift
@@ -62,7 +62,6 @@ public enum NavigationState: Equatable, Comparable {
         isFinished || isFailed
     }
 
-    // swiftlint:disable:next cyclomatic_complexity
     public static func == (lhs: NavigationState, rhs: NavigationState) -> Bool {
         switch lhs {
         case .expected(let navigationType): if case .expected(navigationType) = rhs { return true }

diff --git a/Sources/NetworkProtection/ExtensionMessage/ExtensionMessage.swift b/Sources/NetworkProtection/ExtensionMessage/ExtensionMessage.swift
@@ -70,7 +70,6 @@ public enum ExtensionMessage: RawRepresentable {
     case simulateConnectionInterruption
     case getDataVolume
 
-    // swiftlint:disable:next cyclomatic_complexity function_body_length
     public init?(rawValue data: Data) {
         let name = data.first.flatMap(Name.init(rawValue:))
         switch name {