Run SwiftFormat

davdroman · github-actions[bot] · commit d94fdbf8ebb5 · 2025-05-09T22:44:31.000Z
diff --git a/Examples/Demo/Demo/AppState.swift b/Examples/Demo/Demo/AppState.swift
@@ -18,54 +18,54 @@ final class AppState: ObservableObject {
 		var description: String {
 			switch self {
 			case .default:
-				return "Default"
+				"Default"
 			case .crossFade:
-				return "Fade"
+				"Fade"
 			case .slide:
-				return "Slide"
+				"Slide"
 			case .slideVertically:
-				return "Slide Vertically"
+				"Slide Vertically"
 			case .slideAndFadeIn:
-				return "Slide + Fade In"
+				"Slide + Fade In"
 			case .slideAndFadeOut:
-				return "Slide + Fade Out"
+				"Slide + Fade Out"
 			case .flip:
-				return "Flip"
+				"Flip"
 			case .flipVertically:
-				return "Flip Vertically"
+				"Flip Vertically"
 			case .swing:
-				return "Swing"
+				"Swing"
 			case .zoom:
-				return "Zoom"
+				"Zoom"
 			case .zoomAndSlide:
-				return "Zoom + Slide"
+				"Zoom + Slide"
 			}
 		}
 
 		func callAsFunction() -> AnyNavigationTransition {
 			switch self {
 			case .default:
-				return .default
+				.default
 			case .crossFade:
-				return .fade(.cross)
+				.fade(.cross)
 			case .slide:
-				return .slide
+				.slide
 			case .slideVertically:
-				return .slide(axis: .vertical)
+				.slide(axis: .vertical)
 			case .slideAndFadeIn:
-				return .slide.combined(with: .fade(.in))
+				.slide.combined(with: .fade(.in))
 			case .slideAndFadeOut:
-				return .slide.combined(with: .fade(.out))
+				.slide.combined(with: .fade(.out))
 			case .flip:
-				return .flip
+				.flip
 			case .flipVertically:
-				return .flip(axis: .vertical)
+				.flip(axis: .vertical)
 			case .swing:
-				return .swing
+				.swing
 			case .zoom:
-				return .zoom
+				.zoom
 			case .zoomAndSlide:
-				return .zoom.combined(with: .slide)
+				.zoom.combined(with: .slide)
 			}
 		}
 	}
@@ -79,13 +79,13 @@ final class AppState: ObservableObject {
 		var description: String {
 			switch self {
 			case .none:
-				return "None"
+				"None"
 			case .linear:
-				return "Linear"
+				"Linear"
 			case .easeInOut:
-				return "Ease In Out"
+				"Ease In Out"
 			case .spring:
-				return "Spring"
+				"Spring"
 			}
 		}
 
@@ -96,13 +96,13 @@ final class AppState: ObservableObject {
 		) -> AnyNavigationTransition.Animation? {
 			switch self {
 			case .none:
-				return .none
+				.none
 			case .linear:
-				return .linear(duration: duration())
+				.linear(duration: duration())
 			case .easeInOut:
-				return .easeInOut(duration: duration())
+				.easeInOut(duration: duration())
 			case .spring:
-				return .interpolatingSpring(stiffness: stiffness(), damping: damping())
+				.interpolatingSpring(stiffness: stiffness(), damping: damping())
 			}
 		}
 	}
@@ -115,22 +115,22 @@ final class AppState: ObservableObject {
 		var description: String {
 			switch self {
 			case .slow:
-				return "Slow"
+				"Slow"
 			case .medium:
-				return "Medium"
+				"Medium"
 			case .fast:
-				return "Fast"
+				"Fast"
 			}
 		}
 
 		func callAsFunction() -> Double {
 			switch self {
 			case .slow:
-				return 1
+				1
 			case .medium:
-				return 0.6
+				0.6
 			case .fast:
-				return 0.35
+				0.35
 			}
 		}
 	}
@@ -143,22 +143,22 @@ final class AppState: ObservableObject {
 		var description: String {
 			switch self {
 			case .low:
-				return "Low"
+				"Low"
 			case .medium:
-				return "Medium"
+				"Medium"
 			case .high:
-				return "High"
+				"High"
 			}
 		}
 
 		func callAsFunction() -> Double {
 			switch self {
 			case .low:
-				return 300
+				300
 			case .medium:
-				return 120
+				120
 			case .high:
-				return 50
+				50
 			}
 		}
 	}
@@ -172,26 +172,26 @@ final class AppState: ObservableObject {
 		var description: String {
 			switch self {
 			case .low:
-				return "Low"
+				"Low"
 			case .medium:
-				return "Medium"
+				"Medium"
 			case .high:
-				return "High"
+				"High"
 			case .veryHigh:
-				return "Very High"
+				"Very High"
 			}
 		}
 
 		func callAsFunction() -> Double {
 			switch self {
 			case .low:
-				return 20
+				20
 			case .medium:
-				return 25
+				25
 			case .high:
-				return 30
+				30
 			case .veryHigh:
-				return 50
+				50
 			}
 		}
 	}
@@ -204,22 +204,22 @@ final class AppState: ObservableObject {
 		var description: String {
 			switch self {
 			case .disabled:
-				return "Disabled"
+				"Disabled"
 			case .edgePan:
-				return "Edge Pan"
+				"Edge Pan"
 			case .pan:
-				return "Pan"
+				"Pan"
 			}
 		}
 
 		func callAsFunction() -> AnyNavigationTransition.Interactivity {
 			switch self {
 			case .disabled:
-				return .disabled
+				.disabled
 			case .edgePan:
-				return .edgePan
+				.edgePan
 			case .pan:
-				return .pan
+				.pan
 			}
 		}
 	}
diff --git a/Sources/AtomicTransition/AtomicTransitionBuilder.swift b/Sources/AtomicTransition/AtomicTransitionBuilder.swift
@@ -14,9 +14,9 @@ public enum AtomicTransitionBuilder {
 
 	public static func buildOptional<T: AtomicTransition>(_ component: T?) -> _OptionalTransition<T> {
 		if let component {
-			return _OptionalTransition(component)
+			_OptionalTransition(component)
 		} else {
-			return _OptionalTransition(nil)
+			_OptionalTransition(nil)
 		}
 	}
 
@@ -76,9 +76,9 @@ extension _ConditionalTransition: MirrorableAtomicTransition where TrueTransitio
 	public func mirrored() -> _ConditionalTransition<TrueTransition.Mirrored, FalseTransition.Mirrored> {
 		switch transition {
 		case .left(let trueTransition):
-			return .init(trueTransition: trueTransition.mirrored())
+			.init(trueTransition: trueTransition.mirrored())
 		case .right(let falseTransition):
-			return .init(falseTransition: falseTransition.mirrored())
+			.init(falseTransition: falseTransition.mirrored())
 		}
 	}
 }
diff --git a/Sources/AtomicTransition/Move.swift b/Sources/AtomicTransition/Move.swift
@@ -47,13 +47,13 @@ public struct Move: MirrorableAtomicTransition {
 	public func mirrored() -> Move {
 		switch edge {
 		case .top:
-			return .init(edge: .bottom)
+			.init(edge: .bottom)
 		case .leading:
-			return .init(edge: .trailing)
+			.init(edge: .trailing)
 		case .bottom:
-			return .init(edge: .top)
+			.init(edge: .top)
 		case .trailing:
-			return .init(edge: .leading)
+			.init(edge: .leading)
 		}
 	}
 }
diff --git a/Sources/NavigationTransition/NavigationTransitionBuilder.swift b/Sources/NavigationTransition/NavigationTransitionBuilder.swift
@@ -10,9 +10,9 @@ public enum NavigationTransitionBuilder {
 
 	public static func buildOptional<T: NavigationTransitionProtocol>(_ component: T?) -> _OptionalTransition<T> {
 		if let component {
-			return _OptionalTransition(component)
+			_OptionalTransition(component)
 		} else {
-			return _OptionalTransition(nil)
+			_OptionalTransition(nil)
 		}
 	}
 
diff --git a/Sources/NavigationTransitions/NavigationTransition+UIKit.swift b/Sources/NavigationTransitions/NavigationTransition+UIKit.swift
@@ -56,56 +56,56 @@ extension UISplitViewController {
 extension UISplitViewController {
 	var compactViewController: UIViewController? {
 		if #available(iOS 14, tvOS 14, *) {
-			return viewController(for: .compact)
+			viewController(for: .compact)
 		} else {
 			if isCollapsed {
-				return viewControllers.first
+				viewControllers.first
 			} else {
-				return nil
+				nil
 			}
 		}
 	}
 
 	var primaryViewController: UIViewController? {
 		if #available(iOS 14, tvOS 14, *) {
-			return viewController(for: .primary)
+			viewController(for: .primary)
 		} else {
 			if !isCollapsed {
-				return viewControllers.first
+				viewControllers.first
 			} else {
-				return nil
+				nil
 			}
 		}
 	}
 
 	var supplementaryViewController: UIViewController? {
 		if #available(iOS 14, tvOS 14, *) {
-			return viewController(for: .supplementary)
+			viewController(for: .supplementary)
 		} else {
 			if !isCollapsed {
 				if viewControllers.count >= 3 {
-					return viewControllers[safe: 1]
+					viewControllers[safe: 1]
 				} else {
-					return nil
+					nil
 				}
 			} else {
-				return nil
+				nil
 			}
 		}
 	}
 
 	var secondaryViewController: UIViewController? {
 		if #available(iOS 14, tvOS 14, *) {
-			return viewController(for: .secondary)
+			viewController(for: .secondary)
 		} else {
 			if !isCollapsed {
 				if viewControllers.count >= 3 {
-					return viewControllers[safe: 2]
+					viewControllers[safe: 2]
 				} else {
-					return viewControllers[safe: 1]
+					viewControllers[safe: 1]
 				}
 			} else {
-				return nil
+				nil
 			}
 		}
 	}
@@ -256,25 +256,25 @@ extension UINavigationController {
 
 	@objc private func popViewController_animateIfNeeded(animated: Bool) -> UIViewController? {
 		if let transitionDelegate = customDelegate {
-			return popViewController_animateIfNeeded(animated: transitionDelegate.transition.animation != nil)
+			popViewController_animateIfNeeded(animated: transitionDelegate.transition.animation != nil)
 		} else {
-			return popViewController_animateIfNeeded(animated: animated)
+			popViewController_animateIfNeeded(animated: animated)
 		}
 	}
 
 	@objc private func popToViewController_animateIfNeeded(_ viewController: UIViewController, animated: Bool) -> [UIViewController]? {
 		if let transitionDelegate = customDelegate {
-			return popToViewController_animateIfNeeded(viewController, animated: transitionDelegate.transition.animation != nil)
+			popToViewController_animateIfNeeded(viewController, animated: transitionDelegate.transition.animation != nil)
 		} else {
-			return popToViewController_animateIfNeeded(viewController, animated: animated)
+			popToViewController_animateIfNeeded(viewController, animated: animated)
 		}
 	}
 
 	@objc private func popToRootViewController_animateIfNeeded(animated: Bool) -> UIViewController? {
 		if let transitionDelegate = customDelegate {
-			return popToRootViewController_animateIfNeeded(animated: transitionDelegate.transition.animation != nil)
+			popToRootViewController_animateIfNeeded(animated: transitionDelegate.transition.animation != nil)
 		} else {
-			return popToRootViewController_animateIfNeeded(animated: animated)
+			popToRootViewController_animateIfNeeded(animated: animated)
 		}
 	}
 }
diff --git a/Sources/NavigationTransitions/NavigationTransitionDelegate.swift b/Sources/NavigationTransitions/NavigationTransitionDelegate.swift

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ public enum AtomicTransitionBuilder {`
`14`	`14`
`15`	`15`	`public static func buildOptional<T: AtomicTransition>(_ component: T?) -> _OptionalTransition<T> {`
`16`	`16`	`if let component {`
`17`		`- return _OptionalTransition(component)`
	`17`	`+ _OptionalTransition(component)`
`18`	`18`	`} else {`
`19`		`- return _OptionalTransition(nil)`
	`19`	`+ _OptionalTransition(nil)`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`@@ -76,9 +76,9 @@ extension _ConditionalTransition: MirrorableAtomicTransition where TrueTransitio`
`76`	`76`	`public func mirrored() -> _ConditionalTransition<TrueTransition.Mirrored, FalseTransition.Mirrored> {`
`77`	`77`	`switch transition {`
`78`	`78`	`case .left(let trueTransition):`
`79`		`- return .init(trueTransition: trueTransition.mirrored())`
	`79`	`+ .init(trueTransition: trueTransition.mirrored())`
`80`	`80`	`case .right(let falseTransition):`
`81`		`- return .init(falseTransition: falseTransition.mirrored())`
	`81`	`+ .init(falseTransition: falseTransition.mirrored())`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,13 +47,13 @@ public struct Move: MirrorableAtomicTransition {`
`47`	`47`	`public func mirrored() -> Move {`
`48`	`48`	`switch edge {`
`49`	`49`	`case .top:`
`50`		`- return .init(edge: .bottom)`
	`50`	`+ .init(edge: .bottom)`
`51`	`51`	`case .leading:`
`52`		`- return .init(edge: .trailing)`
	`52`	`+ .init(edge: .trailing)`
`53`	`53`	`case .bottom:`
`54`		`- return .init(edge: .top)`
	`54`	`+ .init(edge: .top)`
`55`	`55`	`case .trailing:`
`56`		`- return .init(edge: .leading)`
	`56`	`+ .init(edge: .leading)`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ public enum NavigationTransitionBuilder {`
`10`	`10`
`11`	`11`	`public static func buildOptional<T: NavigationTransitionProtocol>(_ component: T?) -> _OptionalTransition<T> {`
`12`	`12`	`if let component {`
`13`		`- return _OptionalTransition(component)`
	`13`	`+ _OptionalTransition(component)`
`14`	`14`	`} else {`
`15`		`- return _OptionalTransition(nil)`
	`15`	`+ _OptionalTransition(nil)`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -56,56 +56,56 @@ extension UISplitViewController {`
`56`	`56`	`extension UISplitViewController {`
`57`	`57`	`var compactViewController: UIViewController? {`
`58`	`58`	`if #available(iOS 14, tvOS 14, *) {`
`59`		`- return viewController(for: .compact)`
	`59`	`+ viewController(for: .compact)`
`60`	`60`	`} else {`
`61`	`61`	`if isCollapsed {`
`62`		`- return viewControllers.first`
	`62`	`+ viewControllers.first`
`63`	`63`	`} else {`
`64`		`- return nil`
	`64`	`+ nil`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`var primaryViewController: UIViewController? {`
`70`	`70`	`if #available(iOS 14, tvOS 14, *) {`
`71`		`- return viewController(for: .primary)`
	`71`	`+ viewController(for: .primary)`
`72`	`72`	`} else {`
`73`	`73`	`if !isCollapsed {`
`74`		`- return viewControllers.first`
	`74`	`+ viewControllers.first`
`75`	`75`	`} else {`
`76`		`- return nil`
	`76`	`+ nil`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`var supplementaryViewController: UIViewController? {`
`82`	`82`	`if #available(iOS 14, tvOS 14, *) {`
`83`		`- return viewController(for: .supplementary)`
	`83`	`+ viewController(for: .supplementary)`
`84`	`84`	`} else {`
`85`	`85`	`if !isCollapsed {`
`86`	`86`	`if viewControllers.count >= 3 {`
`87`		`- return viewControllers[safe: 1]`
	`87`	`+ viewControllers[safe: 1]`
`88`	`88`	`} else {`
`89`		`- return nil`
	`89`	`+ nil`
`90`	`90`	`}`
`91`	`91`	`} else {`
`92`		`- return nil`
	`92`	`+ nil`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`var secondaryViewController: UIViewController? {`
`98`	`98`	`if #available(iOS 14, tvOS 14, *) {`
`99`		`- return viewController(for: .secondary)`
	`99`	`+ viewController(for: .secondary)`
`100`	`100`	`} else {`
`101`	`101`	`if !isCollapsed {`
`102`	`102`	`if viewControllers.count >= 3 {`
`103`		`- return viewControllers[safe: 2]`
	`103`	`+ viewControllers[safe: 2]`
`104`	`104`	`} else {`
`105`		`- return viewControllers[safe: 1]`
	`105`	`+ viewControllers[safe: 1]`
`106`	`106`	`}`
`107`	`107`	`} else {`
`108`		`- return nil`
	`108`	`+ nil`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`	`}`
`@@ -256,25 +256,25 @@ extension UINavigationController {`
`256`	`256`
`257`	`257`	`@objc private func popViewController_animateIfNeeded(animated: Bool) -> UIViewController? {`
`258`	`258`	`if let transitionDelegate = customDelegate {`
`259`		`- return popViewController_animateIfNeeded(animated: transitionDelegate.transition.animation != nil)`
	`259`	`+ popViewController_animateIfNeeded(animated: transitionDelegate.transition.animation != nil)`
`260`	`260`	`} else {`
`261`		`- return popViewController_animateIfNeeded(animated: animated)`
	`261`	`+ popViewController_animateIfNeeded(animated: animated)`
`262`	`262`	`}`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`@objc private func popToViewController_animateIfNeeded(_ viewController: UIViewController, animated: Bool) -> [UIViewController]? {`
`266`	`266`	`if let transitionDelegate = customDelegate {`
`267`		`- return popToViewController_animateIfNeeded(viewController, animated: transitionDelegate.transition.animation != nil)`
	`267`	`+ popToViewController_animateIfNeeded(viewController, animated: transitionDelegate.transition.animation != nil)`
`268`	`268`	`} else {`
`269`		`- return popToViewController_animateIfNeeded(viewController, animated: animated)`
	`269`	`+ popToViewController_animateIfNeeded(viewController, animated: animated)`
`270`	`270`	`}`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`@objc private func popToRootViewController_animateIfNeeded(animated: Bool) -> UIViewController? {`
`274`	`274`	`if let transitionDelegate = customDelegate {`
`275`		`- return popToRootViewController_animateIfNeeded(animated: transitionDelegate.transition.animation != nil)`
	`275`	`+ popToRootViewController_animateIfNeeded(animated: transitionDelegate.transition.animation != nil)`
`276`	`276`	`} else {`
`277`		`- return popToRootViewController_animateIfNeeded(animated: animated)`
	`277`	`+ popToRootViewController_animateIfNeeded(animated: animated)`
`278`	`278`	`}`
`279`	`279`	`}`
`280`	`280`	`}`