modify swift format

OneBusAway · Jul 18, 2024 · ec834de · ec834de
1 parent 028c5bf
commit ec834de
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 22 deletions.
diff --git a/OTPKit/Features/OriginDestination/Sheets/AddFavoriteLocationsSheet.swift b/OTPKit/Features/OriginDestination/Sheets/AddFavoriteLocationsSheet.swift
@@ -60,7 +60,7 @@ public struct AddFavoriteLocationsSheet: View {
             .padding(.horizontal, 16)
 
             List {
-                if search.isEmpty, let userLocation = userLocation {
+                if search.isEmpty, let userLocation {
                     Button(action: {
                         switch UserDefaultsServices.shared.saveFavoriteLocationData(data: userLocation) {
                         case .success:

diff --git a/OTPKit/Features/OriginDestination/Sheets/OriginDestinationSheetView.swift b/OTPKit/Features/OriginDestination/Sheets/OriginDestinationSheetView.swift
@@ -132,9 +132,9 @@ public struct OriginDestinationSheetView: View {
     // swiftlint:enable function_body_length
     private func recentsSection() -> some View {
         if sheetEnvironment.recentLocations.isEmpty {
-            return AnyView(EmptyView())
+            AnyView(EmptyView())
         } else {
-            return AnyView(
+            AnyView(
                 Section(content: {
                     ForEach(Array(sheetEnvironment.recentLocations.prefix(5)), content: { location in
                         VStack(alignment: .leading) {
@@ -190,7 +190,7 @@ public struct OriginDestinationSheetView: View {
 
     private func currentUserSection() -> some View {
         Group {
-            if let userLocation = userLocation {
+            if let userLocation {
                 Button(action: {
                     switch UserDefaultsServices.shared.saveRecentLocations(data: userLocation) {
                     case .success:
@@ -222,7 +222,7 @@ public struct OriginDestinationSheetView: View {
                 .padding(.horizontal, 16)
 
             List {
-                if search.isEmpty && isSearchFocused {
+                if search.isEmpty, isSearchFocused {
                     currentUserSection()
                 } else if search.isEmpty {
                     favoritesSection()

diff --git a/OTPKit/Services/LocationServices.swift b/OTPKit/Services/LocationServices.swift
@@ -51,8 +51,8 @@ public final class LocationService: NSObject, ObservableObject, MKLocalSearchCom
             let search = MKLocalSearch(request: searchRequest)
 
             search.start { [weak self] response, error in
-                guard let self = self, let response = response else {
-                    if let error = error {
+                guard let self, let response else {
+                    if let error {
                         print("Error performing local search: \(error)")
                     }
                     return

diff --git a/OTPKit/Services/MapExtensionServices.swift b/OTPKit/Services/MapExtensionServices.swift
@@ -9,7 +9,6 @@ import Foundation
 import MapKit
 import SwiftUI
 
-
 /// Manage Map extension such as markers, etc
 public final class MapExtensionServices: ObservableObject {
     public static let shared = MapExtensionServices()

diff --git a/OTPKit/Services/UserDefaultsServices.swift b/OTPKit/Services/UserDefaultsServices.swift
@@ -35,13 +35,11 @@ public final class UserDefaultsServices {
     }
 
     func saveFavoriteLocationData(data: Location) -> Result<Void, Error> {
-        var locations: [Location]
-
-        switch getFavoriteLocationsData() {
+        var locations: [Location] = switch getFavoriteLocationsData() {
         case let .success(existingLocations):
-            locations = existingLocations
+            existingLocations
         case .failure:
-            locations = []
+            []
         }
 
         locations.append(data)
@@ -98,13 +96,11 @@ public final class UserDefaultsServices {
     }
 
     func saveRecentLocations(data: Location) -> Result<Void, Error> {
-        var locations: [Location]
-
-        switch getFavoriteLocationsData() {
+        var locations: [Location] = switch getFavoriteLocationsData() {
         case let .success(existingLocations):
-            locations = existingLocations
+            existingLocations
         case .failure:
-            locations = []
+            []
         }
 
         locations.insert(data, at: 0)

diff --git a/OTPKitTests/Helpers/MockDataLoader.swift b/OTPKitTests/Helpers/MockDataLoader.swift
@@ -28,7 +28,7 @@ struct MockDataResponse {
 
 class MockTask: URLSessionDataTask {
     override var progress: Progress {
-        return Progress()
+        Progress()
     }
 
     private var closure: (Data?, URLResponse?, Error?) -> Void
@@ -130,7 +130,7 @@ class MockDataLoader: NSObject, URLDataLoader {
     // MARK: - URL Response
 
     func buildURLResponse(URL: URL, statusCode: Int) -> HTTPURLResponse {
-        return HTTPURLResponse(
+        HTTPURLResponse(
             url: URL,
             statusCode: statusCode,
             httpVersion: "2",

diff --git a/OTPKitTests/Helpers/OTPTestCase.swift b/OTPKitTests/Helpers/OTPTestCase.swift
@@ -32,7 +32,7 @@ public class OTPTestCase: XCTestCase {
     }
 
     var userDefaultsSuiteName: String {
-        return String(describing: self)
+        String(describing: self)
     }
 
     // MARK: - Network and Data

diff --git a/scripts/swiftformat.sh b/scripts/swiftformat.sh
@@ -3,7 +3,7 @@ if [[ "$(uname -m)" == arm64 ]]; then
 fi
 
 if which swiftformat > /dev/null; then
-  swiftformat .
+  swiftformat . --swiftversion 5.9
 else
   echo "warning: SwiftFormat not installed, download from https://github.com/nicklockwood/SwiftFormat"
 fi