Skip to content

[Commands] Adopt changes to package manifest refactoring actions #9064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 27, 2025
Merged

[Commands] Adopt changes to package manifest refactoring actions #9064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/Commands/PackageCommands/AddDependency.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ extension SwiftPackageCommand {
}
}

let editResult = try AddPackageDependency.manifestRefactor(
let editResult = try AddPackageDependency.textRefactor(
syntax: manifestSyntax,
in: .init(dependency: packageDependency)
)
Expand Down
2 changes: 1 addition & 1 deletion Sources/Commands/PackageCommands/AddProduct.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ extension SwiftPackageCommand {
targets: targets
)

let editResult = try SwiftRefactor.AddProduct.manifestRefactor(
let editResult = try SwiftRefactor.AddProduct.textRefactor(
syntax: manifestSyntax,
in: .init(product: product)
)
Expand Down
2 changes: 1 addition & 1 deletion Sources/Commands/PackageCommands/AddSetting.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ extension SwiftPackageCommand {
}
}

let editResult: PackageEdit
let editResult: [SourceEdit]

switch setting {
case .experimentalFeature:
Expand Down
3 changes: 2 additions & 1 deletion Sources/Commands/PackageCommands/AddTarget.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ extension SwiftPackageCommand {
url: url,
checksum: checksum
)
let editResult = try AddPackageTarget.manifestRefactor(

let editResult = try AddPackageTarget.textRefactor(
syntax: manifestSyntax,
in: .init(
target: target,
Expand Down
2 changes: 1 addition & 1 deletion Sources/Commands/PackageCommands/AddTargetDependency.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ extension SwiftPackageCommand {
dependency = .target(name: dependencyName)
}

let editResult = try SwiftRefactor.AddTargetDependency.manifestRefactor(
let editResult = try SwiftRefactor.AddTargetDependency.textRefactor(
syntax: manifestSyntax,
in: .init(
dependency: dependency,
Expand Down
4 changes: 2 additions & 2 deletions Sources/Commands/Utilities/RefactoringSupport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import Basics
@_spi(PackageRefactor) import SwiftRefactor
import SwiftSyntax

package extension PackageEdit {
package extension [SourceEdit] {
/// Apply the edits for the given manifest to the specified file system,
/// updating the manifest to the given manifest
func applyEdits(
Expand All @@ -32,7 +32,7 @@ package extension PackageEdit {
}

let updatedManifestSource = FixItApplier.apply(
edits: manifestEdits,
edits: self,
to: manifest
)
try filesystem.writeFileContents(
Expand Down