duckduckgo · tomasstrba · Aug 6, 2022 · Jul 27, 2022 · Aug 3, 2022 · Aug 3, 2022
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -6,6 +6,7 @@ disabled_rules:
   - block_based_kvo
   - compiler_protocol_init
   - unused_setter_value
+  - line_length
 
 opt_in_rules:
   - file_header
@@ -37,8 +38,11 @@ type_name:
     warning: 80
     error: 100
 file_length:
-  warning: 700
+  warning: 1200
   error: 1200
+type_body_length:
+  warning: 500
+  error: 500
 nesting:
   type_level: 2
 file_header:

diff --git a/DuckDuckGo/Bookmarks/Services/BookmarkStore.swift b/DuckDuckGo/Bookmarks/Services/BookmarkStore.swift
@@ -52,7 +52,6 @@ protocol BookmarkStore {
 
 }
 
-// swiftlint:disable type_body_length
 final class LocalBookmarkStore: BookmarkStore {
 
     init() {}
@@ -582,4 +581,3 @@ fileprivate extension BookmarkManagedObject {
     }
 
 }
-// swiftlint:enable type_body_length
diff --git a/DuckDuckGo/Browser Tab/Model/Tab.swift b/DuckDuckGo/Browser Tab/Model/Tab.swift
@@ -41,7 +41,6 @@ protocol TabDelegate: FileDownloadManagerDelegate, ContentOverlayUserScriptDeleg
     func tab(_ tab: Tab, promptUserForCookieConsent result: @escaping (Bool) -> Void)
 }
 
-// swiftlint:disable type_body_length
 // swiftlint:disable file_length
 final class Tab: NSObject, Identifiable, ObservableObject {
 

diff --git a/DuckDuckGo/Browser Tab/View/BrowserTabViewController.swift b/DuckDuckGo/Browser Tab/View/BrowserTabViewController.swift
@@ -27,8 +27,6 @@ protocol BrowserTabViewControllerClickDelegate: AnyObject {
     func browserTabViewController(_ browserTabViewController: BrowserTabViewController, didClickAtPoint: CGPoint)
 }
 
-// swiftlint:disable file_length
-// swiftlint:disable:next type_body_length
 final class BrowserTabViewController: NSViewController {
 
     @IBOutlet weak var errorView: NSView!
@@ -1197,5 +1195,3 @@ extension BrowserTabViewController {
         }
     }
 }
-
-// swiftlint:enable file_length
diff --git a/DuckDuckGo/Data Import/Logins/Firefox/FirefoxEncryptionKeyReader.swift b/DuckDuckGo/Data Import/Logins/Firefox/FirefoxEncryptionKeyReader.swift
@@ -28,7 +28,6 @@ protocol FirefoxEncryptionKeyReading {
 
 }
 
-// swiftlint:disable:next type_body_length
 final class FirefoxEncryptionKeyReader: FirefoxEncryptionKeyReading {
 
     func getEncryptionKey(key3DatabaseURL: URL, primaryPassword: String) -> Result<Data, FirefoxLoginReader.ImportError> {

diff --git a/DuckDuckGo/Data Import/View/DataImportViewController.swift b/DuckDuckGo/Data Import/View/DataImportViewController.swift
@@ -21,7 +21,6 @@ import BrowserServicesKit
 import Combine
 import os.log
 
-// swiftlint:disable type_body_length
 final class DataImportViewController: NSViewController {
 
     enum Constants {
@@ -453,7 +452,6 @@ final class DataImportViewController: NSViewController {
     }
 
 }
-// swiftlint:enable type_body_length
 
 extension DataImportViewController: FileImportViewControllerDelegate {
 

diff --git a/DuckDuckGo/Feedback and Breakage/View/FeedbackViewController.swift b/DuckDuckGo/Feedback and Breakage/View/FeedbackViewController.swift
@@ -19,7 +19,6 @@
 import Cocoa
 import Combine
 
-// swiftlint:disable type_body_length
 final class FeedbackViewController: NSViewController {
 
     enum Constants {
@@ -325,7 +324,6 @@ final class FeedbackViewController: NSViewController {
         thankYouView.isHidden = false
     }
 }
-// swiftlint:enable type_body_length
 
 fileprivate extension WebsiteBreakage.Category {
 

diff --git a/DuckDuckGo/Main/View/MainViewController.swift b/DuckDuckGo/Main/View/MainViewController.swift
@@ -21,7 +21,6 @@ import Carbon.HIToolbox
 import Combine
 import os.log
 
-// swiftlint:disable type_body_length
 final class MainViewController: NSViewController {
 
     @IBOutlet weak var tabBarContainerView: NSView!

diff --git a/DuckDuckGo/Navigation Bar/View/AddressBarButtonsViewController.swift b/DuckDuckGo/Navigation Bar/View/AddressBarButtonsViewController.swift
@@ -27,8 +27,7 @@ protocol AddressBarButtonsViewControllerDelegate: AnyObject {
 
 }
 
-// swiftlint:disable type_body_length
-// swiftlint:disable file_length
+// swiftlint:disable:next type_body_length
 final class AddressBarButtonsViewController: NSViewController {
 
     static let homeFaviconImage = NSImage(named: "Search")
@@ -914,7 +913,6 @@ final class AddressBarButtonsViewController: NSViewController {
     }
 
 }
-// swiftlint:enable type_body_length
 
 extension AddressBarButtonsViewController: PermissionContextMenuDelegate {
 
@@ -975,6 +973,3 @@ final class TrackerAnimationImageProvider: AnimationImageProvider {
     }
 
 }
-
-// swiftlint:enable type_body_length
-// swiftlint:enable file_length
diff --git a/DuckDuckGo/Navigation Bar/View/AddressBarTextField.swift b/DuckDuckGo/Navigation Bar/View/AddressBarTextField.swift
@@ -21,9 +21,6 @@ import Combine
 import os.log
 import BrowserServicesKit
 
-// swiftlint:disable file_length
-// swiftlint:disable type_body_length
-
 protocol AddressBarTextFieldDelegate: AnyObject {
 
     func adressBarTextField(_ addressBarTextField: AddressBarTextField, didChangeValue value: AddressBarTextField.Value)
@@ -1079,6 +1076,3 @@ final class AddressBarTextFieldCell: NSTextFieldCell {
 fileprivate extension NSStoryboard {
     static let suggestion = NSStoryboard(name: "Suggestion", bundle: .main)
 }
-
-// swiftlint:enable type_body_length
-// swiftlint:enable file_length
diff --git a/DuckDuckGo/Navigation Bar/View/AddressBarViewController.swift b/DuckDuckGo/Navigation Bar/View/AddressBarViewController.swift
@@ -21,7 +21,6 @@ import os.log
 import Combine
 import Lottie
 
-// swiftlint:disable type_body_length
 final class AddressBarViewController: NSViewController {
 
     @IBOutlet weak var addressBarTextField: AddressBarTextField!
@@ -354,7 +353,6 @@ final class AddressBarViewController: NSViewController {
     }
 
 }
-// swiftlint:enable type_body_length
 
 extension AddressBarViewController {
 

diff --git a/DuckDuckGo/Navigation Bar/View/NavigationBarViewController.swift b/DuckDuckGo/Navigation Bar/View/NavigationBarViewController.swift
@@ -21,7 +21,6 @@ import Combine
 import os.log
 import BrowserServicesKit
 
-// swiftlint:disable type_body_length file_length
 final class NavigationBarViewController: NSViewController {
 
     enum Constants {
@@ -625,7 +624,6 @@ final class NavigationBarViewController: NSViewController {
     }
 
 }
-// swiftlint:enable type_body_length
 
 extension NavigationBarViewController: OptionsButtonMenuDelegate {
 

diff --git a/DuckDuckGo/Permissions/Model/PermissionModel.swift b/DuckDuckGo/Permissions/Model/PermissionModel.swift
@@ -22,7 +22,6 @@ import WebKit
 import AVFoundation
 import CoreLocation
 
-// swiftlint:disable:next type_body_length
 final class PermissionModel {
 
     @PublishedAfter var permissions = Permissions()

diff --git a/DuckDuckGo/Secure Vault/Extensions/UserText+PasswordManager.swift b/DuckDuckGo/Secure Vault/Extensions/UserText+PasswordManager.swift
@@ -18,7 +18,6 @@
 
 import Foundation
 
-// swiftlint:disable line_length
 extension UserText {
 
     static let pmSaveCredentialsEditableTitle = NSLocalizedString("pm.save-credentials.editable.title", value: "Save Login?", comment: "Title for the editable Save Credentials popover")

diff --git a/DuckDuckGo/Secure Vault/View/PasswordManagementViewController.swift b/DuckDuckGo/Secure Vault/View/PasswordManagementViewController.swift
@@ -21,16 +21,14 @@ import Combine
 import SwiftUI
 import BrowserServicesKit
 
-// swiftlint:disable file_length
-
 protocol PasswordManagementDelegate: AnyObject {
 
     /// May not be called on main thread.
     func shouldClosePasswordManagementViewController(_: PasswordManagementViewController)
 
 }
 
-// swiftlint:disable type_body_length
+// swiftlint:disable:next type_body_length
 final class PasswordManagementViewController: NSViewController {
 
     static func create() -> Self {
@@ -926,5 +924,3 @@ extension PasswordManagementViewController: NSTextViewDelegate {
     }
 
 }
-
-// swiftlint:enable file_length
diff --git a/DuckDuckGo/Tab Bar/View/TabBarViewController.swift b/DuckDuckGo/Tab Bar/View/TabBarViewController.swift
@@ -22,9 +22,6 @@ import Combine
 import Lottie
 import SwiftUI
 
-// swiftlint:disable file_length
-// swiftlint:disable type_body_length
-
 final class TabBarViewController: NSViewController {
 
     enum HorizontalSpace: CGFloat {

diff --git a/DuckDuckGo/Tab Bar/ViewModel/TabCollectionViewModel.swift b/DuckDuckGo/Tab Bar/ViewModel/TabCollectionViewModel.swift
@@ -36,7 +36,6 @@ protocol TabCollectionViewModelDelegate: AnyObject {
 
 }
 
-// swiftlint:disable type_body_length
 final class TabCollectionViewModel: NSObject {
 
     weak var delegate: TabCollectionViewModelDelegate?
@@ -652,4 +651,3 @@ extension TabCollectionViewModel {
         return history
     }
 }
-// swiftlint:enable type_body_length
diff --git a/Unit Tests/AutoconsentMessageProtocolTests.swift b/Unit Tests/AutoconsentMessageProtocolTests.swift
@@ -65,11 +65,9 @@ class AutoconsentMessageProtocolTests: XCTestCase {
         userScript.handleMessage(
             replyHandler: {(msg: Any?, _: String?) in
                 expect.fulfill()
-                // swiftlint:disable line_length
                 XCTAssertEqual(self.replyToJson(msg: msg!), """
                 {"config":{"autoAction":"optOut","detectRetries":20,"disabledCmps":[],"enabled":true,"enablePrehide":true},"rules":null,"type":"initResp"}
                 """)
-                // swiftlint:enable line_length
             },
             message: message
         )

diff --git a/Unit Tests/File Download/DownloadListCoordinatorTests.swift b/Unit Tests/File Download/DownloadListCoordinatorTests.swift
@@ -20,7 +20,6 @@ import Foundation
 import XCTest
 @testable import DuckDuckGo_Privacy_Browser
 
-// swiftlint:disable type_body_length
 @available(macOS 11.3, *)
 final class DownloadListCoordinatorTests: XCTestCase {
     let store = DownloadListStoreMock()
@@ -437,7 +436,6 @@ final class DownloadListCoordinatorTests: XCTestCase {
     }
 
 }
-// swiftlint:enable type_body_length
 
 private struct TestError: Error, Equatable {}
 private extension Data {

diff --git a/Unit Tests/Geolocation/GeolocationProviderTests.swift b/Unit Tests/Geolocation/GeolocationProviderTests.swift
@@ -23,8 +23,6 @@ import CoreLocation
 import WebKit
 @testable import DuckDuckGo_Privacy_Browser
 
-// swiftlint:disable file_length
-// swiftlint:disable type_body_length
 // swiftlint:disable function_body_length
 final class GeolocationProviderTests: XCTestCase {
 
@@ -659,7 +657,6 @@ final class GeolocationProviderTests: XCTestCase {
     }
 
 }
-// swiftlint:enable type_body_length
 // swiftlint:enable function_body_length
 
 extension GeolocationProviderTests: WKUIDelegate {
@@ -769,5 +766,3 @@ extension CLLocation {
         }
     }
 }
-
-// swiftlint:enable file_length
diff --git a/Unit Tests/Permissions/PermissionModelTests.swift b/Unit Tests/Permissions/PermissionModelTests.swift
@@ -23,8 +23,7 @@ import Combine
 import AVFoundation
 @testable import DuckDuckGo_Privacy_Browser
 
-// swiftlint:disable file_length
-// swiftlint:disable type_body_length
+// swiftlint:disable:next type_body_length
 final class PermissionModelTests: XCTestCase {
 
     let permissionManagerMock = PermissionManagerMock()
@@ -1151,6 +1150,3 @@ extension PermissionModelTests: WebViewPermissionsDelegate {
     }
 
 }
-
-// swiftlint:enable type_body_length
-// swiftlint:enable file_length
diff --git a/Unit Tests/Tab Bar/ViewModel/TabCollectionViewModelTests.swift b/Unit Tests/Tab Bar/ViewModel/TabCollectionViewModelTests.swift
@@ -20,8 +20,6 @@ import XCTest
 @testable import DuckDuckGo_Privacy_Browser
 
 // MARK: - Tests for TabCollectionViewModel with PinnedTabsManager but without pinned tabs
-
-// swiftlint:disable:next type_body_length
 final class TabCollectionViewModelTests: XCTestCase {
 
     // MARK: - TabViewModel
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,6 @@ protocol FirefoxEncryptionKeyReading { @@
     }
-    // swiftlint:disable:next type_body_length
     final class FirefoxEncryptionKeyReader: FirefoxEncryptionKeyReading {
         func getEncryptionKey(key3DatabaseURL: URL, primaryPassword: String) -> Result<Data, FirefoxLoginReader.ImportError> {
@@ Expand Down @@