Run SwiftFormat on changes

Author: hi2gage

Sources/Basics/SourceControlURL.swift

@@ -45,26 +45,24 @@ public struct SourceControlURL: Codable, Equatable, Hashable, Sendable {
     }
 
     public var absoluteString: String {
-        return self.urlString
+        self.urlString
     }
 
     public var lastPathComponent: String {
-        return (self.urlString as NSString).lastPathComponent
+        (self.urlString as NSString).lastPathComponent
     }
 
     public var url: URL? {
-        return URL(string: self.urlString)
+        URL(string: self.urlString)
     }
 }
 
 extension SourceControlURL: CustomStringConvertible {
     public var description: String {
-        return self.urlString
+        self.urlString
     }
 }
 
-extension SourceControlURL: ExpressibleByStringInterpolation {
-}
+extension SourceControlURL: ExpressibleByStringInterpolation {}
 
-extension SourceControlURL: ExpressibleByStringLiteral {
-}
+extension SourceControlURL: ExpressibleByStringLiteral {}

Sources/Commands/PackageCommands/AddDependency.swift

@@ -24,7 +24,8 @@ import Workspace
 extension SwiftPackageCommand {
     struct AddDependency: SwiftCommand {
         package static let configuration = CommandConfiguration(
-            abstract: "Add a package dependency to the manifest")
+            abstract: "Add a package dependency to the manifest"
+        )
 
         @Argument(help: "The URL or directory of the package to add")
         var dependency: String
@@ -126,24 +127,28 @@ extension SwiftPackageCommand {
             }
 
             if requirements.count > 1 {
-                throw StringError("must specify at most one of --exact, --branch, --revision, --from, or --up-to-next-minor-from")
+                throw StringError(
+                    "must specify at most one of --exact, --branch, --revision, --from, or --up-to-next-minor-from"
+                )
             }
 
             guard let firstRequirement = requirements.first else {
-                throw StringError("must specify one of --exact, --branch, --revision, --from, or --up-to-next-minor-from")
+                throw StringError(
+                    "must specify one of --exact, --branch, --revision, --from, or --up-to-next-minor-from"
+                )
             }
 
             let requirement: PackageDependency.SourceControl.Requirement
             if case .range(let range) = firstRequirement {
                 if let to {
-                    requirement = .range(range.lowerBound..<to)
+                    requirement = .range(range.lowerBound ..< to)
                 } else {
                     requirement = .range(range)
                 }
             } else {
                 requirement = firstRequirement
 
-                if to != nil {
+                if self.to != nil {
                     throw StringError("--to can only be specified with --from or --up-to-next-minor-from")
                 }
             }
@@ -197,7 +202,7 @@ extension SwiftPackageCommand {
                 to: fileSystem,
                 manifest: manifestSyntax,
                 manifestPath: manifestPath,
-                verbose: !globalOptions.logging.quiet
+                verbose: !self.globalOptions.logging.quiet
             )
         }
     }

Sources/PackageModelSyntax/PackageDependency+Syntax.swift

@@ -12,8 +12,8 @@
 
 import Basics
 import PackageModel
-import SwiftSyntax
 import SwiftParser
+import SwiftSyntax
 import struct TSCUtility.Version
 
 extension PackageDependency: ManifestSyntaxRepresentable {
@@ -88,6 +88,6 @@ extension PackageDependency.SourceControl.Requirement: ManifestSyntaxRepresentab
 
 extension Version: ManifestSyntaxRepresentable {
     func asSyntax() -> ExprSyntax {
-        return "\(literal: description)"
+        "\(literal: description)"
     }
 }

Tests/CommandsTests/PackageCommandTests.swift

@@ -11,25 +11,25 @@
 //===----------------------------------------------------------------------===//
 
 import Basics
-@testable import CoreCommands
 @testable import Commands
+@testable import CoreCommands
 import Foundation
 
 @_spi(DontAdoptOutsideOfSwiftPMExposedForBenchmarksAndTestsOnly)
 import PackageGraph
 
+import _InternalTestSupport
 import PackageLoading
 import PackageModel
 import SourceControl
-import _InternalTestSupport
 import Workspace
 import XCTest
 
-import struct TSCBasic.ByteString
+import class Basics.AsyncProcess
 import class TSCBasic.BufferedOutputByteStream
+import struct TSCBasic.ByteString
 import class TSCBasic.InMemoryFileSystem
 import enum TSCBasic.JSON
-import class Basics.AsyncProcess
 
 final class PackageCommandTests: CommandsTestCase {
     @discardableResult
@@ -800,7 +800,9 @@ final class PackageCommandTests: CommandsTestCase {
             let path = tmpPath.appending("PackageB")
             try fs.createDirectory(path)
 
-            try fs.writeFileContents(path.appending("Package.swift"), string:
+            try fs.writeFileContents(
+                path.appending("Package.swift"),
+                string:
                 """
                 // swift-tools-version: 5.9
                 import PackageDescription
@@ -811,7 +813,7 @@ final class PackageCommandTests: CommandsTestCase {
                 """
             )
 
-            _ = try await execute(
+            _ = try await self.execute(
                 [
                     "add-dependency",
                     "https://github.com/swiftlang/swift-syntax.git",
@@ -825,7 +827,10 @@ final class PackageCommandTests: CommandsTestCase {
             XCTAssertFileExists(manifest)
             let contents: String = try fs.readFileContents(manifest)
 
-            XCTAssertMatch(contents, .contains(#".package(url: "https://github.com/swiftlang/swift-syntax.git", branch: "main"),"#))
+            XCTAssertMatch(
+                contents,
+                .contains(#".package(url: "https://github.com/swiftlang/swift-syntax.git", branch: "main"),"#)
+            )
         }
     }