Rename PackageEditResult -> PackageEdit

This removes a conflict with the SwiftPM version.

Author: DougGregor

Sources/SwiftRefactor/CMakeLists.txt

@@ -32,7 +32,7 @@ add_swift_syntax_library(SwiftRefactor
   PackageManifest/ManifestEditRefactoringProvider.swift
   PackageManifest/ManifestSyntaxRepresentable.swift
   PackageManifest/PackageDependency.swift
-  PackageManifest/PackageEditResult.swift
+  PackageManifest/PackageEdit.swift
   PackageManifest/PackageIdentity.swift
   PackageManifest/ProductDescription.swift
   PackageManifest/ProductType.swift

Sources/SwiftRefactor/PackageManifest/AddPackageDependency.swift

@@ -41,7 +41,7 @@ public struct AddPackageDependency: ManifestEditRefactoringProvider {
   public static func manifestRefactor(
     syntax manifest: SourceFileSyntax,
     in context: Context
-  ) throws -> PackageEditResult {
+  ) throws -> PackageEdit {
     let dependency = context.dependency
     guard let packageCall = manifest.findCall(calleeName: "Package") else {
       throw ManifestEditError.cannotFindPackage
@@ -52,7 +52,7 @@ public struct AddPackageDependency: ManifestEditRefactoringProvider {
       to: packageCall
     )
 
-    return PackageEditResult(
+    return PackageEdit(
       manifestEdits: [
         .replace(packageCall, with: newPackageCall.description)
       ]

Sources/SwiftRefactor/PackageManifest/AddPluginUsage.swift

@@ -39,7 +39,7 @@ public struct AddPluginUsage: ManifestEditRefactoringProvider {
   public static func manifestRefactor(
     syntax manifest: SourceFileSyntax,
     in context: Context
-  ) throws -> PackageEditResult {
+  ) throws -> PackageEdit {
     let targetName = context.targetName
     let pluginUsage = context.pluginUsage
 
@@ -56,7 +56,7 @@ public struct AddPluginUsage: ManifestEditRefactoringProvider {
       newElement: pluginUsage.asSyntax()
     )
 
-    return PackageEditResult(
+    return PackageEdit(
       manifestEdits: [
         .replace(targetCall, with: newTargetCall.description)
       ]

Sources/SwiftRefactor/PackageManifest/AddProduct.swift

@@ -41,7 +41,7 @@ public struct AddProduct: ManifestEditRefactoringProvider {
   public static func manifestRefactor(
     syntax manifest: SourceFileSyntax,
     in context: Context
-  ) throws -> PackageEditResult {
+  ) throws -> PackageEdit {
     let product = context.product
 
     guard let packageCall = manifest.findCall(calleeName: "Package") else {
@@ -54,7 +54,7 @@ public struct AddProduct: ManifestEditRefactoringProvider {
       newElement: product.asSyntax()
     )
 
-    return PackageEditResult(
+    return PackageEdit(
       manifestEdits: [
         .replace(packageCall, with: newPackageCall.description)
       ]

Sources/SwiftRefactor/PackageManifest/AddTarget.swift

@@ -79,7 +79,7 @@ public struct AddTarget: ManifestEditRefactoringProvider {
   public static func manifestRefactor(
     syntax manifest: SourceFileSyntax,
     in context: Context
-  ) throws -> PackageEditResult {
+  ) throws -> PackageEdit {
     let configuration = context.configuration
     guard let packageCall = manifest.findCall(calleeName: "Package") else {
       throw ManifestEditError.cannotFindPackage
@@ -114,7 +114,7 @@ public struct AddTarget: ManifestEditRefactoringProvider {
     }
 
     guard let outerDirectory else {
-      return PackageEditResult(
+      return PackageEdit(
         manifestEdits: [
           .replace(packageCall, with: newPackageCall.description)
         ]
@@ -175,7 +175,7 @@ public struct AddTarget: ManifestEditRefactoringProvider {
     default: break;
     }
 
-    return PackageEditResult(
+    return PackageEdit(
       manifestEdits: [
         .replace(packageCall, with: newPackageCall.description)
       ] + extraManifestEdits,

Sources/SwiftRefactor/PackageManifest/AddTargetDependency.swift

@@ -53,7 +53,7 @@ public struct AddTargetDependency: ManifestEditRefactoringProvider {
   public static func manifestRefactor(
     syntax manifest: SourceFileSyntax,
     in context: Context
-  ) throws -> PackageEditResult {
+  ) throws -> PackageEdit {
     let dependency = context.dependency
     let targetName = context.targetName
 
@@ -69,7 +69,7 @@ public struct AddTargetDependency: ManifestEditRefactoringProvider {
       to: targetCall
     )
 
-    return PackageEditResult(
+    return PackageEdit(
       manifestEdits: [
         .replace(targetCall, with: newTargetCall.description)
       ]

Sources/SwiftRefactor/PackageManifest/ManifestEditRefactoringProvider.swift

@@ -15,7 +15,7 @@ import SwiftSyntax
 public protocol ManifestEditRefactoringProvider: EditRefactoringProvider
 where Self.Input == SourceFileSyntax {
 
-  static func manifestRefactor(syntax: SourceFileSyntax, in context: Context) throws -> PackageEditResult
+  static func manifestRefactor(syntax: SourceFileSyntax, in context: Context) throws -> PackageEdit
 }
 
 extension EditRefactoringProvider where Self: ManifestEditRefactoringProvider {

Sources/SwiftRefactor/PackageManifest/PackageEditResult.swift renamed to Sources/SwiftRefactor/PackageManifest/PackageEdit.swift

@@ -14,7 +14,7 @@ import SwiftSyntax
 
 /// The result of editing a package, including any edits to the package
 /// manifest and any new files that are introduced.
-public struct PackageEditResult {
+public struct PackageEdit {
   /// Edits to perform to the package manifest.
   public var manifestEdits: [SourceEdit] = []
 

Tests/SwiftRefactorTest/ManifestEditTests.swift

@@ -673,7 +673,7 @@ func assertManifestRefactor(
   expectedAuxiliarySources: [RelativePath: SourceFileSyntax] = [:],
   file: StaticString = #filePath,
   line: UInt = #line,
-  operation: (SourceFileSyntax) throws -> PackageEditResult
+  operation: (SourceFileSyntax) throws -> PackageEdit
 ) rethrows {
   let edits = try operation(originalManifest)
   let editedManifestSource = FixItApplier.apply(