luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8415 from azdrojowa123/1.12.x-build-target-sources 

Return build targets sources from `buildTarget/dependencySources` request
This commit is contained in:
eugene yokota 2025-12-14 15:43:13 -05:00 committed by GitHub
parent 9d62f5e940 14f1839647
commit d3bd93e2f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala
View File

@ -26,7 +26,7 @@ import sbt.internal.protocol.JsonRpcRequestMessage
import sbt.internal.util.{ Attributed, ErrorHandling } import sbt.internal.util.{ Attributed, ErrorHandling }
import sbt.internal.util.complete.{ Parser, Parsers } import sbt.internal.util.complete.{ Parser, Parsers }
import sbt.librarymanagement.CrossVersion.binaryScalaVersion import sbt.librarymanagement.CrossVersion.binaryScalaVersion
import sbt.librarymanagement.{ Configuration, ScalaArtifacts } import sbt.librarymanagement.{ Configuration, ScalaArtifacts, UpdateReport }
import sbt.std.TaskExtra import sbt.std.TaskExtra
import sbt.util.Logger import sbt.util.Logger
import sjsonnew.shaded.scalajson.ast.unsafe.{ JNull, JValue } import sjsonnew.shaded.scalajson.ast.unsafe.{ JNull, JValue }
@ -158,7 +158,18 @@ object BuildServerProtocol {
import sbt.internal.bsp.codec.JsonProtocol._ import sbt.internal.bsp.codec.JsonProtocol._
val items = bspBuildTargetDependencySourcesItem.result.all(filter).value val items = bspBuildTargetDependencySourcesItem.result.all(filter).value
val successfulItems = anyOrThrow(items) val successfulItems = anyOrThrow(items)
val result = DependencySourcesResult(successfulItems.toVector)
val buildItems = workspace.builds
.map {
case (targetId, loadedBuildUnit) =>
val projRef = ProjectRef(loadedBuildUnit.unit.uri, loadedBuildUnit.root)
(projRef / updateSbtClassifiers).map(getDependencySourceItem(targetId, _))
}
.toSeq
.join
.value
val result = DependencySourcesResult((successfulItems ++ buildItems).toVector)
state.respondEvent(result) state.respondEvent(result)
} }
}.evaluated, }.evaluated,
@ -770,8 +781,16 @@ object BuildServerProtocol {
} }
private def dependencySourcesItemTask: Def.Initialize[Task[DependencySourcesItem]] = Def.task { private def dependencySourcesItemTask: Def.Initialize[Task[DependencySourcesItem]] = Def.task {
val targetId = Keys.bspTargetIdentifier.value getDependencySourceItem(
val updateReport = Keys.updateClassifiers.value Keys.bspTargetIdentifier.value,
Keys.updateClassifiers.value
)
}
private def getDependencySourceItem(
targetId: BuildTargetIdentifier,
updateReport: UpdateReport
): DependencySourcesItem = {
val sources = for { val sources = for {
configuration <- updateReport.configurations.view configuration <- updateReport.configurations.view
module <- configuration.modules.view module <- configuration.modules.view