Update SwiftFormat to 510.1.0 (#645)

.swift-version

@@ -1 +1 @@
-5.8
+5.10

.swiftformat

@@ -24,6 +24,7 @@
 --disable hoistTry
 --disable redundantType
 --disable unusedArguments
+--disable redundantReturn
 
 # Enabled
 

Data/BatchDownloader/Sources/Downloader/DownloadBatchResponse.swift

@@ -70,12 +70,11 @@ public actor DownloadBatchResponse {
 
         for download in batch.downloads {
             let request = download.request
-            let state: ResponseData.State
-            switch download.status {
+            let state: ResponseData.State = switch download.status {
             case .completed:
-                state = .finished
+                .finished
             case .downloading:
-                state = .inProgress
+                .inProgress
             }
             responses[request] = ResponseData(request: request, state: state, taskId: download.taskId, task: nil)
         }

Data/BatchDownloader/Sources/Downloader/DownloadSessionDelegate.swift

@@ -151,11 +151,10 @@ actor DownloadSessionDelegate: NetworkSessionDelegate {
         crasher.recordError(error, reason: "Download network error occurred")
 
         // check if no disk space
-        let finalError: Error
-        if let error = error as? POSIXError, error.code == .ENOENT {
-            finalError = FileSystemError.noDiskSpace
+        let finalError: Error = if let error = error as? POSIXError, error.code == .ENOENT {
+            FileSystemError.noDiskSpace
         } else {
-            finalError = NetworkError(error: error)
+            NetworkError(error: error)
         }
         return finalError
     }

Domain/QuranTextKit/Sources/Localization/QuranKit+Localization.swift

@@ -58,12 +58,11 @@ extension Quarter {
         let rub = quarterNumber - 1
         let reminder = rub % 4
 
-        let fraction: String?
-        switch reminder {
-        case 1: fraction = lAndroid("quran_rob3")
-        case 2: fraction = lAndroid("quran_nos")
-        case 3: fraction = lAndroid("quran_talt_arb3")
-        default: fraction = nil
+        let fraction: String? = switch reminder {
+        case 1: lAndroid("quran_rob3")
+        case 2: lAndroid("quran_nos")
+        case 3: lAndroid("quran_talt_arb3")
+        default: nil
         }
 
         let hizbString = hizb.localizedName

Domain/ReciterServiceFake/Reciter+Fixture.swift

@@ -37,10 +37,9 @@ extension Reciter {
     }
 
     public func toPlistDictionary() -> [String: Any] {
-        let databaseName: String
-        switch audioType {
-        case .gapless(let db): databaseName = db
-        case .gapped: databaseName = ""
+        let databaseName: String = switch audioType {
+        case .gapless(let db): db
+        case .gapped: ""
         }
         return [
             "id": id,

Domain/WordTextService/Sources/WordTextService.swift

@@ -21,12 +21,11 @@ public struct WordTextService {
 
     public func textForWord(_ word: Word) async throws -> String? {
         let textType = preferences.wordTextType
-        var text: String?
-        switch textType {
+        let text: String? = switch textType {
         case .translation:
-            text = try await persistence.translationForWord(word)
+            try await persistence.translationForWord(word)
         case .transliteration:
-            text = try await persistence.transliterationForWord(word)
+            try await persistence.transliterationForWord(word)
         }
         return text
     }

Features/FeaturesSupport/Errors+Description.swift

@@ -16,12 +16,11 @@ import SQLitePersistence
 
 extension FileSystemError: LocalizedError {
     public var errorDescription: String? {
-        let text: String
-        switch self {
+        let text: String = switch self {
         case .unknown:
-            text = l("error.message.general")
+            l("error.message.general")
         case .noDiskSpace:
-            text = l("error.message.no_disk_space")
+            l("error.message.no_disk_space")
         }
         return text
     }

Features/WordPointerFeature/WordPointerViewController.swift

@@ -228,11 +228,10 @@ public final class WordPointerViewController: UIViewController {
             hideWordPopover()
             viewModel.unhighlightWord()
 
-            let goLeft: Bool
-            if abs(velocity.x) > 100 {
-                goLeft = velocity.x < 0
+            let goLeft: Bool = if abs(velocity.x) > 100 {
+                velocity.x < 0
             } else {
-                goLeft = pointer.center.x < container.bounds.width / 2
+                pointer.center.x < container.bounds.width / 2
             }
 
             let finalY = max(10, min(container.bounds.height - pointer.bounds.height, velocity.y * 0.3 + pointer.frame.minY))

Makefile

@@ -1,7 +1,7 @@
 BUILD_TOOLS_DIR=./BuildTools
 
 SWIFTFORMAT_REPO=https://github.com/nicklockwood/SwiftFormat
-SWIFTFORMAT_VERSION=0.53.10
+SWIFTFORMAT_VERSION=0.54.3
 SWIFTFORMAT_DIR=$(BUILD_TOOLS_DIR)/SwiftFormat
 SWIFTFORMAT_BIN=$(SWIFTFORMAT_DIR)/.build/release/swiftformat
 

UI/NoorUI/Font/FontSize++.swift

@@ -20,15 +20,14 @@ extension FontSize: Strideable {
 
 extension FontSize {
     func fontSize(forMediumSize size: CGFloat) -> CGFloat {
-        let factor: CGFloat
-        switch self {
-        case .xxSmall: factor = 0.7 * 0.7 * 0.7
-        case .xSmall: factor = 0.7 * 0.7
-        case .small: factor = 0.7
-        case .medium: factor = 1
-        case .large: factor = 1 / 0.8
-        case .xLarge: factor = 1 / 0.8 / 0.8
-        case .xxLarge: factor = 1 / 0.8 / 0.8 / 0.8
+        let factor: CGFloat = switch self {
+        case .xxSmall: 0.7 * 0.7 * 0.7
+        case .xSmall: 0.7 * 0.7
+        case .small: 0.7
+        case .medium: 1
+        case .large: 1 / 0.8
+        case .xLarge: 1 / 0.8 / 0.8
+        case .xxLarge: 1 / 0.8 / 0.8 / 0.8
         }
         return size * factor
     }

UI/NoorUI/Pager/PageViewController.swift

@@ -140,11 +140,10 @@ private struct _PageViewController<Element, Content>: UIViewControllerRepresenta
 
         let previousIndex = forEach.data.firstIndex { $0 == previousSelection }
         let currentIndex = forEach.data.firstIndex { $0 == selection }
-        let direction: UIPageViewController.NavigationDirection
-        if let previousIndex, let currentIndex {
-            direction = currentIndex < previousIndex ? .forward : .reverse
+        let direction: UIPageViewController.NavigationDirection = if let previousIndex, let currentIndex {
+            currentIndex < previousIndex ? .forward : .reverse
         } else {
-            direction = .forward
+            .forward
         }
 
         pageViewController.setViewControllers([viewController], direction: direction, animated: animated)

UI/UIx/UIKit/Views/BackgroundColorButton.swift

@@ -84,15 +84,14 @@ open class BackgroundColorButton: UIButton {
     }
 
     private func updateBackgroundColor() {
-        let background: UIColor
-        if !isEnabled {
-            background = disabledBackground
+        let background: UIColor = if !isEnabled {
+            disabledBackground
         } else if isHighlighted {
-            background = highlightedBackground
+            highlightedBackground
         } else if isSelected {
-            background = selectedBackground
+            selectedBackground
         } else {
-            background = normalBackground
+            normalBackground
         }
 
         backgroundColor = background

UI/ViewConstrainer/ViewConstrainer.swift

@@ -98,17 +98,16 @@ extension ViewConstrainer {
         superviewFirst: Bool,
         usesMargins: Bool
     ) -> SingleConstrainer {
-        let marginalAttribute: NSLayoutConstraint.Attribute
-        if usesMargins {
+        let marginalAttribute: NSLayoutConstraint.Attribute = if usesMargins {
             switch attribute {
-            case .leading: marginalAttribute = .leadingMargin
-            case .trailing: marginalAttribute = .trailingMargin
-            case .top: marginalAttribute = .topMargin
-            case .bottom: marginalAttribute = .bottomMargin
-            default: marginalAttribute = attribute
+            case .leading: .leadingMargin
+            case .trailing: .trailingMargin
+            case .top: .topMargin
+            case .bottom: .bottomMargin
+            default: attribute
             }
         } else {
-            marginalAttribute = attribute
+            attribute
         }
         guard let superview = view.superview else {
             fatalError("View \(view) should have been added as subview to another view before constraining it.")