Add FXIOS-8821 [SwiftLint] for_where

focus-ios/.swiftlint.yml

@@ -15,7 +15,7 @@ only_rules: # Only enforce these rules, ignore all others
   - empty_enum_arguments
   # - empty_parameters
   # - empty_parentheses_with_trailing_closure
-  # - for_where
+  - for_where
   - force_try
   - implicit_getter
   - inclusive_language

focus-ios/Blockzilla/Extensions/StringExtensions.swift

@@ -192,29 +192,28 @@ extension String {
     }
 
     public func utf8HostToAscii() -> String {
+        // Check if the entire string is already in Unicode Scala
         if isValidUnicodeScala(self) {
             return self
         }
         var labels = self.components(separatedBy: ".")
-        for (i, part) in labels.enumerated() {
-            if !isValidUnicodeScala(part) {
-                let a = encode(part)
-                labels[i] = String.prefixPunycode + a
-            }
+        for (index, part) in labels.enumerated() where !isValidUnicodeScala(part) {
+            let encodedPart = encode(part)
+            labels[index] = String.prefixPunycode + encodedPart
         }
         let resultString = labels.joined(separator: ".")
         return resultString
     }
 
     public func asciiHostToUTF8() -> String {
-        var labels = self.components(separatedBy: ".")
-        for (index, part) in labels.enumerated() {
+        let transformedLabels = self.components(separatedBy: ".").enumerated().map { (index, part) -> String in
             if isValidPunycodeScala(part) {
                 let changeStr = String(part[part.index(part.startIndex, offsetBy: 4)...])
-                labels[index] = decode(changeStr)
+                return decode(changeStr)
+            } else {
+                return part
             }
         }
-        let resultString = labels.joined(separator: ".")
-        return resultString
+        return transformedLabels.joined(separator: ".")
     }
 }

focus-ios/Blockzilla/Tracking Protection/TrackingProtectionPageStats.swift

@@ -192,28 +192,27 @@ private class TPStatsBlocklists {
             return nil
         }
 
-        domainSearch: for rule in rules {
-            // First, test the top-level filters to see if this URL might be blocked.
-            if rule.regex.firstMatch(in: resourceString, options: .anchored, range: resourceRange) != nil {
-                // Check the domain exceptions. If a domain exception matches, this filter does not apply.
-                for domainRegex in (rule.domainExceptions ?? []) {
-                    if domainRegex.firstMatch(in: resourceString, options: [], range: resourceRange) != nil {
-                        continue domainSearch
-                    }
+        for rule in rules {
+            guard let _ = rule.regex.firstMatch(in: resourceString, options: .anchored, range: resourceRange) else {
+                continue
+            }
+            let hasDomainException = rule.domainExceptions?.contains { domainRegex in
+                domainRegex.firstMatch(in: resourceString, options: [], range: resourceRange) != nil
+            } ?? false
+            guard !hasDomainException else {
+                continue
+            }
+            if let baseDomain = url.baseDomain, !permittedDomains.isEmpty {
+                let range = NSRange(location: 0, length: baseDomain.count)
+                let isPermittedDomain = permittedDomains.contains { ignoreDomain in
+                    ignoreDomain.firstMatch(in: baseDomain, options: [], range: range) != nil
                 }
-
-                // Check the whitelist.
-                if let baseDomain = url.baseDomain, !permittedDomains.isEmpty {
-                    let range = NSRange(location: 0, length: baseDomain.count)
-                    for ignoreDomain in permittedDomains {
-                        if ignoreDomain.firstMatch(in: baseDomain, options: [], range: range) != nil {
-                            return nil
-                        }
-                    }
+                guard !isPermittedDomain else {
+                    continue
                 }
-
-                return rule.list
             }
+
+            return rule.list
         }
 
         return nil

focus-ios/Blockzilla/Utilities/KeyboardHelper.swift

@@ -81,15 +81,11 @@ public class KeyboardHelper: NSObject {
      * Delegates are weakly held.
      */
     public func addDelegate(delegate: KeyboardHelperDelegate) {
-        for weakDelegate in delegates {
-            // Reuse any existing slots that have been deallocated.
-            if weakDelegate.delegate == nil {
-                weakDelegate.delegate = delegate
-                return
-            }
+        if let availableSlot = delegates.first(where: { $0.delegate == nil }) {
+            availableSlot.delegate = delegate
+        } else {
+            delegates.append(WeakKeyboardDelegate(delegate))
         }
-
-        delegates.append(WeakKeyboardDelegate(delegate))
     }
 
     @objc func keyboardWillShow(notification: NSNotification) {

focus-ios/Blockzilla/Utilities/SearchHistoryUtils.swift

@@ -27,29 +27,21 @@ class SearchHistoryUtils {
 
     static func pushSearchToStack(with searchedText: String) {
         // Check whether the lastSearch is the current search. If not, remove subsequent searches
-        if let lastSearch = currentStack.last, !lastSearch.isCurrentSearch {
-            for index in 0..<currentStack.count {
-                if currentStack[index].isCurrentSearch {
-                    currentStack.removeSubrange(index+1..<currentStack.count)
-                    break
-                }
-            }
+        if let lastIndex = currentStack.firstIndex(where: { !$0.isCurrentSearch }) {
+            currentStack.removeSubrange(lastIndex + 1..<currentStack.count)
         }
 
-        for index in 0..<currentStack.count {
+        for index in currentStack.indices {
             currentStack[index].isCurrentSearch = false
         }
 
         currentStack.append(textSearched(text: searchedText, isCurrentSearch: true))
     }
 
     static func pullSearchFromStack() -> String? {
-        for search in currentStack {
-            if search.isCurrentSearch {
-                return search.text
-            }
+        for search in currentStack where search.isCurrentSearch {
+            return search.text
         }
-
         return nil
     }
 

focus-ios/Blockzilla/Utilities/WebCacheUtils.swift

@@ -21,10 +21,9 @@ class WebCacheUtils {
         // Delete other remnants in the cache directory, such as HSTS.plist.
         if let cachesPath = NSSearchPathForDirectoriesInDomains(.cachesDirectory, .userDomainMask, true).first {
             let contents = (try? FileManager.default.contentsOfDirectory(atPath: cachesPath)) ?? []
-            for file in contents {
-                if !PermittedFolderList.contains(file) {
-                    FileManager.default.removeItemAndContents(path: "\(cachesPath)/\(file)")
-                }
+            let filesToRemove = contents.filter { !PermittedFolderList.contains($0) }
+            filesToRemove.forEach {
+                FileManager.default.removeItemAndContents(path: "\(cachesPath)/\($0)")
             }
         }
     }

focus-ios/BlockzillaPackage/Sources/UIHelpers/UIViewExtensions.swift

@@ -32,12 +32,6 @@ public extension UIView {
     }
 
     func removeGradient() {
-        if let  buttonSublayers = self.layer.sublayers {
-            for layer in buttonSublayers {
-                if layer is CAGradientLayer {
-                    layer.removeFromSuperlayer()
-                }
-            }
-        }
+        self.layer.sublayers?.compactMap { $0 as? CAGradientLayer }.forEach { $0.removeFromSuperlayer() }
     }
 }