averello/sourcekit-lsp
1
0
Fork 0
mirror of https://github.com/apple/sourcekit-lsp.git synced 2026-03-02 18:23:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement InverseSourcesRequest in BuildSystemManager

Browse Source 
`buildTarget/inverseSources` is not required to be implemented by BSP servers and we have almost all information needed for it in `BuildSystemManager`.

This also makes sure that `buildTarget/sources` and `buildTarget/inverseSources` actually match each other. Before this change, we had source files like `Package.swift` for which we returned a target from `buildTarget/inverseSources` but that weren’t part of that target’s sources retrieved using `buildTarget/sources`.
This commit is contained in:
Alex Hoppen
2024-09-14 08:39:01 -07:00
parent 14e96311ed
commit 5870ad9eb4
19 changed files with 271 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift
View File

@@ -125,7 +125,7 @@ extension BuildTargetIdentifier {
}
fileprivate extension TSCBasic.AbsolutePath {
var asURI: DocumentURI? {
var asURI: DocumentURI {
DocumentURI(self.asURL)
}
}
@@ -512,7 +512,7 @@ extension SwiftPMBuildSystem: BuildSystemIntegration.BuiltInBuildSystem {
}
package func buildTargets(request: BuildTargetsRequest) async throws -> BuildTargetsResponse {
let targets = self.swiftPMTargets.map { (targetId, target) in
var targets = self.swiftPMTargets.map { (targetId, target) in
var tags: [BuildTargetTag] = [.test]
if !target.isPartOfRootPackage {
tags.append(.dependency)
@@ -530,6 +530,17 @@ extension SwiftPMBuildSystem: BuildSystemIntegration.BuiltInBuildSystem {
data: SourceKitBuildTarget(toolchain: toolchain.path?.asURI).encodeToLSPAny()
)
}
targets.append(
BuildTarget(
id: .forPackageManifest,
displayName: "Package.swift",
baseDirectory: nil,
tags: [.notBuildable],
capabilities: BuildTargetCapabilities(),
languageIds: [.swift],
dependencies: []
)
)
return BuildTargetsResponse(targets: targets)
}
@@ -538,12 +549,35 @@ extension SwiftPMBuildSystem: BuildSystemIntegration.BuiltInBuildSystem {
// TODO: Query The SwiftPM build system for the document's language and add it to SourceItem.data
// (https://github.com/swiftlang/sourcekit-lsp/issues/1267)
for target in request.targets {
if target == .forPackageManifest {
result.append(
SourcesItem(
target: target,
sources: [
SourceItem(
uri: projectRoot.appending(component: "Package.swift").asURI,
kind: .file,
generated: false
)
]
)
)
}
guard let swiftPMTarget = self.swiftPMTargets[target] else {
continue
}
let sources = swiftPMTarget.sources.map {
var sources = swiftPMTarget.sources.map {
SourceItem(uri: DocumentURI($0), kind: .file, generated: false)
}
sources += swiftPMTarget.headers.map {
SourceItem(
uri: DocumentURI($0),
kind: .file,
generated: false,
dataKind: .sourceKit,
data: SourceKitSourceItemData(isHeader: true).encodeToLSPAny()
)
}
result.append(SourcesItem(target: target, sources: sources))
}
return BuildTargetSourcesResponse(items: result)
@@ -614,10 +648,6 @@ extension SwiftPMBuildSystem: BuildSystemIntegration.BuiltInBuildSystem {
return []
}
package func inverseSources(request: InverseSourcesRequest) -> InverseSourcesResponse {
return InverseSourcesResponse(targets: targets(for: request.textDocument.uri))
}
package func waitForUpBuildSystemUpdates(request: WaitForBuildSystemUpdatesRequest) async -> VoidResponse {
await self.packageLoadingQueue.async {}.valuePropagatingCancellation
return VoidResponse()