[SwiftRefactor] PackageManifest: Rename Target to PackageTarget

Author: xedin

Sources/SwiftRefactor/CMakeLists.txt

@@ -35,13 +35,13 @@ add_swift_syntax_library(SwiftRefactor
   PackageManifest/PackageDependency.swift
   PackageManifest/PackageEdit.swift
   PackageManifest/PackageIdentity.swift
+  PackageManifest/PackageTarget.swift
   PackageManifest/ProductDescription.swift
   PackageManifest/RelativePath.swift
   PackageManifest/SemanticVersion.swift
   PackageManifest/SourceControlURL.swift
   PackageManifest/StringUtils.swift
   PackageManifest/SyntaxEditUtils.swift
-  PackageManifest/Target.swift
 )
 
 target_link_swift_syntax_libraries(SwiftRefactor PUBLIC

Sources/SwiftRefactor/PackageManifest/AddPackageTarget.swift

@@ -17,10 +17,10 @@ import SwiftSyntaxBuilder
 /// Add a target to a manifest's source code.
 public struct AddPackageTarget: ManifestEditRefactoringProvider {
   public struct Context {
-    public let target: Target
+    public let target: PackageTarget
     public let configuration: Configuration
 
-    public init(target: Target, configuration: Configuration = .init()) {
+    public init(target: PackageTarget, configuration: Configuration = .init()) {
       self.target = target
       self.configuration = configuration
     }
@@ -187,7 +187,7 @@ public struct AddPackageTarget: ManifestEditRefactoringProvider {
   /// source files.
   fileprivate static func addPrimarySourceFile(
     outerPath: RelativePath,
-    target: Target,
+    target: PackageTarget,
     configuration: Configuration,
     to auxiliaryFiles: inout AuxiliaryFiles
   ) {
@@ -300,7 +300,7 @@ public struct AddPackageTarget: ManifestEditRefactoringProvider {
   /// for a macro target.
   fileprivate static func addProvidedMacrosSourceFile(
     outerPath: RelativePath,
-    target: Target,
+    target: PackageTarget,
     to auxiliaryFiles: inout AuxiliaryFiles
   ) {
     auxiliaryFiles.addSourceFile(
@@ -321,7 +321,7 @@ public struct AddPackageTarget: ManifestEditRefactoringProvider {
   }
 }
 
-fileprivate extension Target.Dependency {
+fileprivate extension PackageTarget.Dependency {
   /// Retrieve the name of the dependency
   var name: String {
     switch self {
@@ -349,7 +349,7 @@ fileprivate extension AuxiliaryFiles {
 
 /// The set of dependencies we need to introduce to a newly-created macro
 /// target.
-fileprivate let macroTargetDependencies: [Target.Dependency] = [
+fileprivate let macroTargetDependencies: [PackageTarget.Dependency] = [
   .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
   .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
 ]
@@ -375,7 +375,7 @@ fileprivate extension PackageDependency {
   }
 }
 
-fileprivate extension Target {
+fileprivate extension PackageTarget {
   var sanitizedName: String {
     name
       .mangledToC99ExtendedIdentifier()

Sources/SwiftRefactor/PackageManifest/AddPluginUsage.swift

@@ -19,9 +19,9 @@ import SwiftSyntaxBuilder
 public struct AddPluginUsage: ManifestEditRefactoringProvider {
   public struct Context {
     public let targetName: String
-    public let pluginUsage: Target.PluginUsage
+    public let pluginUsage: PackageTarget.PluginUsage
 
-    public init(targetName: String, pluginUsage: Target.PluginUsage) {
+    public init(targetName: String, pluginUsage: PackageTarget.PluginUsage) {
       self.targetName = targetName
       self.pluginUsage = pluginUsage
     }

Sources/SwiftRefactor/PackageManifest/AddTargetDependency.swift

@@ -18,12 +18,12 @@ import SwiftSyntaxBuilder
 public struct AddTargetDependency: ManifestEditRefactoringProvider {
   public struct Context {
     /// The dependency to add.
-    public var dependency: Target.Dependency
+    public var dependency: PackageTarget.Dependency
 
     /// The name of the target to which the dependency will be added.
     public var targetName: String
 
-    public init(dependency: Target.Dependency, targetName: String) {
+    public init(dependency: PackageTarget.Dependency, targetName: String) {
       self.dependency = dependency
       self.targetName = targetName
     }
@@ -78,7 +78,7 @@ public struct AddTargetDependency: ManifestEditRefactoringProvider {
 
   /// Implementation of adding a target dependency to an existing call.
   static func addTargetDependencyLocal(
-    _ dependency: Target.Dependency,
+    _ dependency: PackageTarget.Dependency,
     to targetCall: FunctionCallExprSyntax
   ) throws -> FunctionCallExprSyntax {
     try targetCall.appendingToArrayArgument(

Sources/SwiftRefactor/PackageManifest/Target.swift renamed to Sources/SwiftRefactor/PackageManifest/PackageTarget.swift

@@ -14,7 +14,7 @@ import SwiftSyntax
 
 /// Syntactic wrapper type that describes a target for refactoring
 /// purposes but does not interpret its contents.
-public struct Target {
+public struct PackageTarget {
   public let name: String
 
   /// The type of target.
@@ -71,7 +71,7 @@ public struct Target {
   }
 }
 
-extension Target: ManifestSyntaxRepresentable {
+extension PackageTarget: ManifestSyntaxRepresentable {
   /// The function name in the package manifest.
   private var functionName: String {
     switch type {
@@ -111,7 +111,7 @@ extension Target: ManifestSyntaxRepresentable {
   }
 }
 
-extension Target.Dependency: ManifestSyntaxRepresentable {
+extension PackageTarget.Dependency: ManifestSyntaxRepresentable {
   func asSyntax() -> ExprSyntax {
     switch self {
     case .byName(name: let name):
@@ -129,7 +129,7 @@ extension Target.Dependency: ManifestSyntaxRepresentable {
   }
 }
 
-extension Target.PluginUsage: ManifestSyntaxRepresentable {
+extension PackageTarget.PluginUsage: ManifestSyntaxRepresentable {
   func asSyntax() -> ExprSyntax {
     switch self {
     case .plugin(name: let name, package: nil):

Tests/SwiftRefactorTest/ManifestEditTests.swift

@@ -436,7 +436,7 @@ final class ManifestEditTests: XCTestCase {
       ],
       provider: AddPackageTarget.self,
       context: .init(
-        target: Target(name: "MyLib")
+        target: PackageTarget(name: "MyLib")
       )
     )
   }
@@ -475,7 +475,7 @@ final class ManifestEditTests: XCTestCase {
       ],
       provider: AddPackageTarget.self,
       context: .init(
-        target: Target(
+        target: PackageTarget(
           name: "MyLib",
           dependencies: [
             .byName(name: "OtherLib"),
@@ -533,7 +533,7 @@ final class ManifestEditTests: XCTestCase {
       ],
       provider: AddPackageTarget.self,
       context: .init(
-        target: Target(
+        target: PackageTarget(
           name: "MyProgram target-name",
           type: .executable,
           dependencies: [
@@ -604,7 +604,7 @@ final class ManifestEditTests: XCTestCase {
       ],
       provider: AddPackageTarget.self,
       context: .init(
-        target: Target(
+        target: PackageTarget(
           name: "MyMacro target-name",
           type: .macro
         )
@@ -644,7 +644,7 @@ final class ManifestEditTests: XCTestCase {
       ],
       provider: AddPackageTarget.self,
       context: .init(
-        target: Target(
+        target: PackageTarget(
           name: "MyTest target-name",
           type: .test
         ),