[Commands] Switch AddTargetDependency to use refactoring action from swift-syntax

Author: xedin

Package.swift

@@ -629,7 +629,7 @@ let package = Package(
                 "XCBuildSupport",
                 "SwiftBuildSupport",
                 "SwiftFixIt",
-            ] + swiftSyntaxDependencies(["SwiftIDEUtils"]),
+            ] + swiftSyntaxDependencies(["SwiftIDEUtils", "SwiftRefactor"]),
             exclude: ["CMakeLists.txt", "README.md"],
             swiftSettings: swift6CompatibleExperimentalFeatures + [
                 .unsafeFlags(["-static"]),

Sources/Commands/CMakeLists.txt

@@ -53,11 +53,13 @@ add_library(Commands
   Utilities/MultiRootSupport.swift
   Utilities/PlainTextEncoder.swift
   Utilities/PluginDelegate.swift
+  Utilities/RefactoringSupport.swift
   Utilities/SymbolGraphExtract.swift
   Utilities/TestingSupport.swift
   Utilities/XCTEvents.swift)
 target_link_libraries(Commands PUBLIC
   SwiftCollections::OrderedCollections
+  SwiftSyntax::SwiftRefactor
   ArgumentParser
   Basics
   BinarySymbols

Sources/Commands/PackageCommands/AddTargetDependency.swift

@@ -16,8 +16,8 @@ import CoreCommands
 import Foundation
 import PackageGraph
 import PackageModel
-import PackageModelSyntax
 import SwiftParser
+@_spi(PackageRefactor) import SwiftRefactor
 import SwiftSyntax
 import TSCBasic
 import TSCUtility
@@ -66,17 +66,19 @@ extension SwiftPackageCommand {
                 }
             }
 
-            let dependency: TargetDescription.Dependency
+            let dependency: PackageTarget.Dependency
             if let package {
                 dependency = .product(name: dependencyName, package: package)
             } else {
-                dependency = .target(name: dependencyName, condition: nil)
+                dependency = .target(name: dependencyName)
             }
 
-            let editResult = try PackageModelSyntax.AddTargetDependency.addTargetDependency(
-                dependency,
-                targetName: targetName,
-                to: manifestSyntax
+            let editResult = try SwiftRefactor.AddTargetDependency.manifestRefactor(
+                syntax: manifestSyntax,
+                in: .init(
+                    dependency: dependency,
+                    targetName: targetName
+                )
             )
 
             try editResult.applyEdits(

Sources/Commands/Utilities/RefactoringSupport.swift

@@ -0,0 +1,87 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
+//
+// Copyright (c) 2014-2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import Basics
+@_spi(FixItApplier) import SwiftIDEUtils
+@_spi(PackageRefactor) import SwiftRefactor
+import SwiftSyntax
+
+package extension PackageEdit {
+    /// Apply the edits for the given manifest to the specified file system,
+    /// updating the manifest to the given manifest
+    func applyEdits(
+        to filesystem: any FileSystem,
+        manifest: SourceFileSyntax,
+        manifestPath: AbsolutePath,
+        verbose: Bool
+    ) throws {
+        let rootPath = manifestPath.parentDirectory
+
+        // Update the manifest
+        if verbose {
+            print("Updating package manifest at \(manifestPath.relative(to: rootPath))...", terminator: "")
+        }
+
+        let updatedManifestSource = FixItApplier.apply(
+            edits: manifestEdits,
+            to: manifest
+        )
+        try filesystem.writeFileContents(
+            manifestPath,
+            string: updatedManifestSource
+        )
+        if verbose {
+            print(" done.")
+        }
+
+        // Write all of the auxiliary files.
+        for (auxiliaryFileRelPath, auxiliaryFileSyntax) in auxiliaryFiles {
+            // If the file already exists, skip it.
+            let filePath = try rootPath.appending(RelativePath(validating: auxiliaryFileRelPath))
+            if filesystem.exists(filePath) {
+                if verbose {
+                    print("Skipping \(filePath.relative(to: rootPath)) because it already exists.")
+                }
+
+                continue
+            }
+
+            // If the directory does not exist yet, create it.
+            let fileDir = filePath.parentDirectory
+            if !filesystem.exists(fileDir) {
+                if verbose {
+                    print("Creating directory \(fileDir.relative(to: rootPath))...", terminator: "")
+                }
+
+                try filesystem.createDirectory(fileDir, recursive: true)
+
+                if verbose {
+                    print(" done.")
+                }
+            }
+
+            // Write the file.
+            if verbose {
+                print("Writing \(filePath.relative(to: rootPath))...", terminator: "")
+            }
+
+            try filesystem.writeFileContents(
+                filePath,
+                string: auxiliaryFileSyntax.description
+            )
+
+            if verbose {
+                print(" done.")
+            }
+        }
+    }
+}