[SwiftRefactor] PackageManifest: Replace PackageEdit with [SourceEdit]

None more auxiliary files means that we don't need an extra type.

Author: xedin

Sources/SwiftRefactor/CMakeLists.txt

@@ -33,7 +33,6 @@ add_swift_syntax_library(SwiftRefactor
   PackageManifest/ManifestEditRefactoringProvider.swift
   PackageManifest/ManifestSyntaxRepresentable.swift
   PackageManifest/PackageDependency.swift
-  PackageManifest/PackageEdit.swift
   PackageManifest/PackageTarget.swift
   PackageManifest/ProductDescription.swift
   PackageManifest/StringUtils.swift

Sources/SwiftRefactor/PackageManifest/AddPackageDependency.swift

@@ -39,7 +39,7 @@ public struct AddPackageDependency: ManifestEditRefactoringProvider {
   public static func manifestRefactor(
     syntax manifest: SourceFileSyntax,
     in context: Context
-  ) throws -> PackageEdit {
+  ) throws -> [SourceEdit] {
     let dependency = context.dependency
     guard let packageCall = manifest.findCall(calleeName: "Package") else {
       throw ManifestEditError.cannotFindPackage
@@ -51,19 +51,17 @@ public struct AddPackageDependency: ManifestEditRefactoringProvider {
         in: packageCall
       )
     else {
-      return PackageEdit(manifestEdits: [])
+      return []
     }
 
     let newPackageCall = try addPackageDependencyLocal(
       dependency,
       to: packageCall
     )
 
-    return PackageEdit(
-      manifestEdits: [
-        .replace(packageCall, with: newPackageCall.description)
-      ]
-    )
+    return [
+      .replace(packageCall, with: newPackageCall.description)
+    ]
   }
 
   /// Return `true` if the dependency already exists in the manifest, otherwise return `false`.

Sources/SwiftRefactor/PackageManifest/AddPackageTarget.swift

@@ -60,7 +60,7 @@ public struct AddPackageTarget: ManifestEditRefactoringProvider {
   public static func manifestRefactor(
     syntax manifest: SourceFileSyntax,
     in context: Context
-  ) throws -> PackageEdit {
+  ) throws -> [SourceEdit] {
     guard let packageCall = manifest.findCall(calleeName: "Package") else {
       throw ManifestEditError.cannotFindPackage
     }
@@ -119,11 +119,9 @@ public struct AddPackageTarget: ManifestEditRefactoringProvider {
     default: break
     }
 
-    return PackageEdit(
-      manifestEdits: [
-        .replace(packageCall, with: newPackageCall.description)
-      ] + extraManifestEdits
-    )
+    return [
+      .replace(packageCall, with: newPackageCall.description)
+    ] + extraManifestEdits
   }
 }
 

Sources/SwiftRefactor/PackageManifest/AddPluginUsage.swift

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

Sources/SwiftRefactor/PackageManifest/AddProduct.swift

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

Sources/SwiftRefactor/PackageManifest/AddSwiftSetting.swift

@@ -34,7 +34,7 @@ public struct AddSwiftSetting: ManifestEditRefactoringProvider {
     to target: String,
     name: String,
     manifest: SourceFileSyntax
-  ) throws -> PackageEdit {
+  ) throws -> [SourceEdit] {
     try manifestRefactor(
       syntax: manifest,
       in: .init(
@@ -49,7 +49,7 @@ public struct AddSwiftSetting: ManifestEditRefactoringProvider {
     to target: String,
     name: String,
     manifest: SourceFileSyntax
-  ) throws -> PackageEdit {
+  ) throws -> [SourceEdit] {
     try manifestRefactor(
       syntax: manifest,
       in: .init(
@@ -64,7 +64,7 @@ public struct AddSwiftSetting: ManifestEditRefactoringProvider {
     to target: String,
     mode rawMode: String,
     manifest: SourceFileSyntax
-  ) throws -> PackageEdit {
+  ) throws -> [SourceEdit] {
     let mode: String
     switch rawMode {
     case "3", "4", "5", "6":
@@ -88,7 +88,7 @@ public struct AddSwiftSetting: ManifestEditRefactoringProvider {
   public static func strictMemorySafety(
     to target: String,
     manifest: SourceFileSyntax
-  ) throws -> PackageEdit {
+  ) throws -> [SourceEdit] {
     try manifestRefactor(
       syntax: manifest,
       in: .init(
@@ -102,7 +102,7 @@ public struct AddSwiftSetting: ManifestEditRefactoringProvider {
   public static func manifestRefactor(
     syntax manifest: SourceFileSyntax,
     in context: Context
-  ) throws -> PackageEdit {
+  ) throws -> [SourceEdit] {
     guard let packageCall = manifest.findCall(calleeName: "Package") else {
       throw ManifestEditError.cannotFindPackage
     }
@@ -154,10 +154,8 @@ public struct AddSwiftSetting: ManifestEditRefactoringProvider {
         )
       }
 
-    return PackageEdit(
-      manifestEdits: [
-        .replace(targetCall, with: newTargetCall.description)
-      ]
-    )
+    return [
+      .replace(targetCall, with: newTargetCall.description)
+    ]
   }
 }

Sources/SwiftRefactor/PackageManifest/AddTargetDependency.swift

@@ -51,7 +51,7 @@ public struct AddTargetDependency: ManifestEditRefactoringProvider {
   public static func manifestRefactor(
     syntax manifest: SourceFileSyntax,
     in context: Context
-  ) throws -> PackageEdit {
+  ) throws -> [SourceEdit] {
     let dependency = context.dependency
     let targetName = context.targetName
 
@@ -67,11 +67,9 @@ public struct AddTargetDependency: ManifestEditRefactoringProvider {
       to: targetCall
     )
 
-    return PackageEdit(
-      manifestEdits: [
-        .replace(targetCall, with: newTargetCall.description)
-      ]
-    )
+    return [
+      .replace(targetCall, with: newTargetCall.description)
+    ]
   }
 
   /// Implementation of adding a target dependency to an existing call.

Sources/SwiftRefactor/PackageManifest/ManifestEditRefactoringProvider.swift

@@ -16,11 +16,11 @@ import SwiftSyntax
 public protocol ManifestEditRefactoringProvider: EditRefactoringProvider
 where Self.Input == SourceFileSyntax {
 
-  static func manifestRefactor(syntax: SourceFileSyntax, in context: Context) throws -> PackageEdit
+  static func manifestRefactor(syntax: SourceFileSyntax, in context: Context) throws -> [SourceEdit]
 }
 
 extension ManifestEditRefactoringProvider {
   public static func textRefactor(syntax: Input, in context: Context) -> [SourceEdit] {
-    return (try? manifestRefactor(syntax: syntax, in: context).manifestEdits) ?? []
+    return (try? manifestRefactor(syntax: syntax, in: context)) ?? []
   }
 }

Sources/SwiftRefactor/PackageManifest/PackageEdit.swift

@@ -994,11 +994,11 @@ func assertManifestRefactor(
   expectedManifest: SourceFileSyntax,
   file: StaticString = #filePath,
   line: UInt = #line,
-  operation: (SourceFileSyntax) throws -> PackageEdit
+  operation: (SourceFileSyntax) throws -> [SourceEdit]
 ) rethrows {
   let edits = try operation(originalManifest)
   let editedManifestSource = FixItApplier.apply(
-    edits: edits.manifestEdits,
+    edits: edits,
     to: originalManifest
   )