Skip to content

[CodeActions] Switch to use swift-syntax package manifest abstraction… #2235

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 13, 2025
+23 −26
Merged

[CodeActions] Switch to use swift-syntax package manifest abstraction… #2235

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
49 changes: 23 additions & 26 deletions Sources/SourceKitLSP/Swift/CodeActions/PackageManifestEdits.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,10 @@
//
//===----------------------------------------------------------------------===//

#if !NO_SWIFTPM_DEPENDENCY

import Foundation
import LanguageServerProtocol
import PackageModel
import PackageModelSyntax
import SwiftParser
import SwiftRefactor
@_spi(PackageRefactor) import SwiftRefactor
import SwiftSyntax

import struct Basics.RelativePath
Expand All @@ -41,21 +37,21 @@ struct PackageManifestEdits: SyntaxCodeActionProvider {
) -> [CodeAction] {
do {
var actions: [CodeAction] = []
let variants: [(TargetDescription.TargetKind, String)] = [
(.regular, "library"),
let variants: [(PackageTarget.TargetKind, String)] = [
(.library, "library"),
(.executable, "executable"),
(.macro, "macro"),
]

for (type, name) in variants {
let target = try TargetDescription(
let target = PackageTarget(
name: "NewTarget",
type: type
)

let edits = try AddTarget.addTarget(
target,
to: scope.file
let edits = try AddPackageTarget.manifestRefactor(
syntax: scope.file,
in: .init(target: target)
)

actions.append(
Expand Down Expand Up @@ -89,22 +85,21 @@ struct PackageManifestEdits: SyntaxCodeActionProvider {
do {
var actions: [CodeAction] = []

let variants: [(AddTarget.TestHarness, String)] = [
let variants: [(AddPackageTarget.TestHarness, String)] = [
(.swiftTesting, "Swift Testing"),
(.xctest, "XCTest"),
]
for (testingLibrary, libraryName) in variants {
// Describe the target we are going to create.
let target = try TargetDescription(
let target = PackageTarget(
name: "\(targetName)Tests",
dependencies: [.byName(name: targetName, condition: nil)],
type: .test
type: .test,
dependencies: [.byName(name: targetName)],
)

let edits = try AddTarget.addTarget(
target,
to: scope.file,
configuration: .init(testHarness: testingLibrary)
let edits = try AddPackageTarget.manifestRefactor(
syntax: scope.file,
in: .init(target: target, testHarness: testingLibrary)
)

actions.append(
Expand Down Expand Up @@ -143,19 +138,23 @@ struct PackageManifestEdits: SyntaxCodeActionProvider {
}

do {
let type: ProductType =
let type: ProductDescription.ProductType =
calledMember == "executableTarget"
? .executable
: .library(.automatic)

// Describe the target we are going to create.
let product = try ProductDescription(
let product = ProductDescription(
name: targetName,
type: type,
targets: [targetName]
)

let edits = try AddProduct.addProduct(product, to: scope.file)
let edits = try AddProduct.manifestRefactor(
syntax: scope.file,
in: .init(product: product)
)

return [
CodeAction(
title: "Add product to export this target",
Expand All @@ -175,7 +174,7 @@ struct PackageManifestEdits: SyntaxCodeActionProvider {
]
}

fileprivate extension PackageEditResult {
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.
Expand Down Expand Up @@ -218,7 +217,7 @@ fileprivate extension PackageEditResult {
for (relativePath, contents) in auxiliaryFiles {
guard
let url = URL(
string: relativePath.pathString,
string: relativePath,
relativeTo: manifestDirectoryURL
)
else {
Expand Down Expand Up @@ -300,5 +299,3 @@ fileprivate extension FunctionCallExprSyntax {
return memberAccess.declName.baseName.text
}
}

#endif