[SwiftLanguageService] Adopt changes to package manifest refactoring actions

Previously package manifest refactoring actions conformed to a custom
refactoring provider and produced a `PackageEdit` that, in addition to
manifest file changes, included a list of auxiliary files. This is no
longer the case and all package manifest refactoring actions are now
responsible only for manifest file transformations, the rest is handled
separately.

Author: xedin

Sources/SwiftLanguageService/CodeActions/PackageManifestEdits.swift

@@ -50,7 +50,7 @@ struct PackageManifestEdits: SyntaxCodeActionProvider {
           type: type
         )
 
-        let edits = try AddPackageTarget.manifestRefactor(
+        let edits = try AddPackageTarget.textRefactor(
           syntax: scope.file,
           in: .init(target: target)
         )
@@ -98,7 +98,7 @@ struct PackageManifestEdits: SyntaxCodeActionProvider {
           dependencies: [.byName(name: targetName)],
         )
 
-        let edits = try AddPackageTarget.manifestRefactor(
+        let edits = try AddPackageTarget.textRefactor(
           syntax: scope.file,
           in: .init(target: target, testHarness: testingLibrary)
         )
@@ -151,7 +151,7 @@ struct PackageManifestEdits: SyntaxCodeActionProvider {
         targets: [targetName]
       )
 
-      let edits = try AddProduct.manifestRefactor(
+      let edits = try AddProduct.textRefactor(
         syntax: scope.file,
         in: .init(product: product)
       )
@@ -175,81 +175,20 @@ struct PackageManifestEdits: SyntaxCodeActionProvider {
   ]
 }
 
-fileprivate extension PackageEdit {
-  /// Translate package manifest edits into a workspace edit. This can
-  /// involve both modifications to the manifest file as well as the creation
-  /// of new files.
+fileprivate extension [SourceEdit] {
+  /// Translate package manifest edits into a workspace edit.
   /// `snapshot` is the latest snapshot of the `Package.swift` file.
   func asWorkspaceEdit(snapshot: DocumentSnapshot) -> WorkspaceEdit {
     // The edits to perform on the manifest itself.
-    let manifestTextEdits = manifestEdits.map { edit in
+    let manifestTextEdits = map { edit in
       TextEdit(
         range: snapshot.absolutePositionRange(of: edit.range),
         newText: edit.replacement
       )
     }
 
-    // If we couldn't figure out the manifest directory, or there are no
-    // files to add, the only changes are the manifest edits. We're done
-    // here.
-    let manifestDirectoryURL = snapshot.uri.fileURL?
-      .deletingLastPathComponent()
-    guard let manifestDirectoryURL, !auxiliaryFiles.isEmpty else {
-      return WorkspaceEdit(
-        changes: [snapshot.uri: manifestTextEdits]
-      )
-    }
-
-    // Use the more full-featured documentChanges, which takes precedence
-    // over the individual changes to documents.
-    var documentChanges: [WorkspaceEditDocumentChange] = []
-
-    // Put the manifest changes into the array.
-    documentChanges.append(
-      .textDocumentEdit(
-        TextDocumentEdit(
-          textDocument: .init(snapshot.uri, version: snapshot.version),
-          edits: manifestTextEdits.map { .textEdit($0) }
-        )
-      )
-    )
-
-    // Create an populate all of the auxiliary files.
-    for (relativePath, contents) in auxiliaryFiles {
-      guard
-        let url = URL(
-          string: relativePath,
-          relativeTo: manifestDirectoryURL
-        )
-      else {
-        continue
-      }
-
-      let documentURI = DocumentURI(url)
-      let createFile = CreateFile(
-        uri: documentURI
-      )
-
-      let zeroPosition = Position(line: 0, utf16index: 0)
-      let edit = TextEdit(
-        range: zeroPosition..<zeroPosition,
-        newText: contents.description
-      )
-
-      documentChanges.append(.createFile(createFile))
-      documentChanges.append(
-        .textDocumentEdit(
-          TextDocumentEdit(
-            textDocument: .init(documentURI, version: snapshot.version),
-            edits: [.textEdit(edit)]
-          )
-        )
-      )
-    }
-
     return WorkspaceEdit(
-      changes: [snapshot.uri: manifestTextEdits],
-      documentChanges: documentChanges
+      changes: [snapshot.uri: manifestTextEdits]
     )
   }
 }

Tests/SourceKitLSPTests/CodeActionTests.swift

@@ -623,29 +623,19 @@ final class CodeActionTests: XCTestCase {
       }
     )
 
-    guard let addTestChanges = addTestAction?.edit?.documentChanges else {
+    guard let addTestChanges = addTestAction?.edit?.changes else {
       XCTFail("Didn't have changes in the 'Add test target (Swift Testing)' action")
       return
     }
 
-    guard
-      let addTestEdit = addTestChanges.lazy.compactMap({ change in
-        switch change {
-        case .textDocumentEdit(let edit): edit
-        default: nil
-        }
-      }).first
-    else {
+    guard let manifestEdits = addTestChanges[uri] else {
       XCTFail("Didn't have edits")
       return
     }
 
     XCTAssertTrue(
-      addTestEdit.edits.contains { edit in
-        switch edit {
-        case .textEdit(let edit): edit.newText.contains("testTarget")
-        case .annotatedTextEdit(let edit): edit.newText.contains("testTarget")
-        }
+      manifestEdits.contains { edit in
+        edit.newText.contains("testTarget")
       }
     )