[SwiftRefactor] PackageManifest: Switch refactoring actions to EditRefactoringProvider

Since `PackageEdit` is gone all of the package manifest refactoring
actions can now conform to `EditRefactoringProvider` directly.

Author: xedin

Sources/SwiftRefactor/CMakeLists.txt

@@ -30,7 +30,6 @@ add_swift_syntax_library(SwiftRefactor
   PackageManifest/AddSwiftSetting.swift
   PackageManifest/AddTargetDependency.swift
   PackageManifest/ManifestEditError.swift
-  PackageManifest/ManifestEditRefactoringProvider.swift
   PackageManifest/ManifestSyntaxRepresentable.swift
   PackageManifest/PackageDependency.swift
   PackageManifest/PackageTarget.swift

Sources/SwiftRefactor/PackageManifest/AddPackageDependency.swift

@@ -16,7 +16,7 @@ import SwiftSyntaxBuilder
 
 /// Add a package dependency to a package manifest's source code.
 @_spi(PackageRefactor)
-public struct AddPackageDependency: ManifestEditRefactoringProvider {
+public struct AddPackageDependency: EditRefactoringProvider {
   public struct Context {
     public var dependency: PackageDependency
 
@@ -36,7 +36,7 @@ public struct AddPackageDependency: ManifestEditRefactoringProvider {
 
   /// Produce the set of source edits needed to add the given package
   /// dependency to the given manifest file.
-  public static func manifestRefactor(
+  public static func textRefactor(
     syntax manifest: SourceFileSyntax,
     in context: Context
   ) throws -> [SourceEdit] {

Sources/SwiftRefactor/PackageManifest/AddPackageTarget.swift

@@ -16,7 +16,7 @@ import SwiftSyntaxBuilder
 
 /// Add a target to a manifest's source code.
 @_spi(PackageRefactor)
-public struct AddPackageTarget: ManifestEditRefactoringProvider {
+public struct AddPackageTarget: EditRefactoringProvider {
   public struct Context {
     public let target: PackageTarget
     public var testHarness: TestHarness
@@ -57,7 +57,7 @@ public struct AddPackageTarget: ManifestEditRefactoringProvider {
   /// Add the given target to the manifest, producing a set of edit results
   /// that updates the manifest and adds some source files to stub out the
   /// new target.
-  public static func manifestRefactor(
+  public static func textRefactor(
     syntax manifest: SourceFileSyntax,
     in context: Context
   ) throws -> [SourceEdit] {

Sources/SwiftRefactor/PackageManifest/AddPluginUsage.swift

@@ -17,7 +17,7 @@ import SwiftSyntaxBuilder
 /// Add a plugin usage to a particular target in the manifest's source
 /// code.
 @_spi(PackageRefactor)
-public struct AddPluginUsage: ManifestEditRefactoringProvider {
+public struct AddPluginUsage: EditRefactoringProvider {
   public struct Context {
     public let targetName: String
     public let pluginUsage: PackageTarget.PluginUsage
@@ -30,7 +30,7 @@ public struct AddPluginUsage: ManifestEditRefactoringProvider {
 
   /// Produce the set of source edits needed to add the given package
   /// dependency to the given manifest file.
-  public static func manifestRefactor(
+  public static func textRefactor(
     syntax manifest: SourceFileSyntax,
     in context: Context
   ) throws -> [SourceEdit] {

Sources/SwiftRefactor/PackageManifest/AddProduct.swift

@@ -16,7 +16,7 @@ import SwiftSyntaxBuilder
 
 /// Add a product to the manifest's source code.
 @_spi(PackageRefactor)
-public struct AddProduct: ManifestEditRefactoringProvider {
+public struct AddProduct: EditRefactoringProvider {
   public struct Context {
     public let product: ProductDescription
 
@@ -36,7 +36,7 @@ public struct AddProduct: ManifestEditRefactoringProvider {
 
   /// Produce the set of source edits needed to add the given package
   /// dependency to the given manifest file.
-  public static func manifestRefactor(
+  public static func textRefactor(
     syntax manifest: SourceFileSyntax,
     in context: Context
   ) throws -> [SourceEdit] {

Sources/SwiftRefactor/PackageManifest/AddSwiftSetting.swift

@@ -16,7 +16,7 @@ import SwiftSyntaxBuilder
 
 /// Add a swift setting to a manifest's source code.
 @_spi(PackageRefactor)
-public struct AddSwiftSetting: ManifestEditRefactoringProvider {
+public struct AddSwiftSetting: EditRefactoringProvider {
   public struct Context {
     let target: String
     let setting: String
@@ -35,7 +35,7 @@ public struct AddSwiftSetting: ManifestEditRefactoringProvider {
     name: String,
     manifest: SourceFileSyntax
   ) throws -> [SourceEdit] {
-    try manifestRefactor(
+    try textRefactor(
       syntax: manifest,
       in: .init(
         target: target,
@@ -50,7 +50,7 @@ public struct AddSwiftSetting: ManifestEditRefactoringProvider {
     name: String,
     manifest: SourceFileSyntax
   ) throws -> [SourceEdit] {
-    try manifestRefactor(
+    try textRefactor(
       syntax: manifest,
       in: .init(
         target: target,
@@ -75,7 +75,7 @@ public struct AddSwiftSetting: ManifestEditRefactoringProvider {
       mode = ".version(\"\(rawMode)\")"
     }
 
-    return try manifestRefactor(
+    return try textRefactor(
       syntax: manifest,
       in: .init(
         target: target,
@@ -89,7 +89,7 @@ public struct AddSwiftSetting: ManifestEditRefactoringProvider {
     to target: String,
     manifest: SourceFileSyntax
   ) throws -> [SourceEdit] {
-    try manifestRefactor(
+    try textRefactor(
       syntax: manifest,
       in: .init(
         target: target,
@@ -99,7 +99,7 @@ public struct AddSwiftSetting: ManifestEditRefactoringProvider {
     )
   }
 
-  public static func manifestRefactor(
+  public static func textRefactor(
     syntax manifest: SourceFileSyntax,
     in context: Context
   ) throws -> [SourceEdit] {

Sources/SwiftRefactor/PackageManifest/AddTargetDependency.swift

@@ -16,7 +16,7 @@ import SwiftSyntaxBuilder
 
 /// Add a target dependency to a manifest's source code.
 @_spi(PackageRefactor)
-public struct AddTargetDependency: ManifestEditRefactoringProvider {
+public struct AddTargetDependency: EditRefactoringProvider {
   public struct Context {
     /// The dependency to add.
     public var dependency: PackageTarget.Dependency
@@ -48,7 +48,7 @@ public struct AddTargetDependency: ManifestEditRefactoringProvider {
 
   /// Produce the set of source edits needed to add the given target
   /// dependency to the given manifest file.
-  public static func manifestRefactor(
+  public static func textRefactor(
     syntax manifest: SourceFileSyntax,
     in context: Context
   ) throws -> [SourceEdit] {

Sources/SwiftRefactor/PackageManifest/ManifestEditRefactoringProvider.swift

@@ -160,7 +160,7 @@ final class ManifestEditTests: XCTestCase {
 
   func testAddPackageDependencyDuplicates() throws {
     XCTAssertThrowsError(
-      try AddPackageDependency.manifestRefactor(
+      try AddPackageDependency.textRefactor(
         syntax: """
           // swift-tools-version: 5.5
           let package = Package(
@@ -351,7 +351,7 @@ final class ManifestEditTests: XCTestCase {
 
   func testAddPackageDependencyErrors() {
     XCTAssertThrowsError(
-      try AddPackageDependency.manifestRefactor(
+      try AddPackageDependency.textRefactor(
         syntax: """
           // swift-tools-version: 5.5
           let package: Package = .init(
@@ -368,7 +368,7 @@ final class ManifestEditTests: XCTestCase {
     }
 
     XCTAssertThrowsError(
-      try AddPackageDependency.manifestRefactor(
+      try AddPackageDependency.textRefactor(
         syntax: """
           // swift-tools-version: 5.5
           let package = Package(
@@ -969,21 +969,21 @@ final class ManifestEditTests: XCTestCase {
 
 /// Assert that applying the given edit/refactor operation to the manifest
 /// produces the expected manifest source file.
-func assertManifestRefactor<Provider: ManifestEditRefactoringProvider>(
-  _ originalManifest: SourceFileSyntax,
-  expectedManifest: SourceFileSyntax,
+func assertManifestRefactor<Provider: EditRefactoringProvider>(
+  _ originalManifest: Provider.Input,
+  expectedManifest: Provider.Input,
   provider: Provider.Type,
   context: Provider.Context,
   file: StaticString = #filePath,
   line: UInt = #line
-) throws {
+) throws where Provider.Input == SourceFileSyntax {
   return try assertManifestRefactor(
     originalManifest,
     expectedManifest: expectedManifest,
     file: file,
     line: line
   ) { (manifest) in
-    try provider.manifestRefactor(syntax: manifest, in: context)
+    try provider.textRefactor(syntax: manifest, in: context)
   }
 }