From 0d9f40811b3257073ddaf087d1cd25db444dfef6 Mon Sep 17 00:00:00 2001
From: Aleksandra Zdrojowa <aleksandra.zdrojowa@jetbrains.com>
Date: Mon, 8 Dec 2025 19:22:35 +0100
Subject: [PATCH] return build targets sources from
 `buildTarget/dependencySources` request #8403

---
 .../internal/server/BuildServerProtocol.scala | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala b/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala
index 68d385f9f..2d0992ddf 100644
--- a/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala
+++ b/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala
@@ -26,7 +26,7 @@ import sbt.internal.protocol.JsonRpcRequestMessage
 import sbt.internal.util.{ Attributed, ErrorHandling }
 import sbt.internal.util.complete.{ Parser, Parsers }
 import sbt.librarymanagement.CrossVersion.binaryScalaVersion
-import sbt.librarymanagement.{ Configuration, ScalaArtifacts }
+import sbt.librarymanagement.{ Configuration, ScalaArtifacts, UpdateReport }
 import sbt.std.TaskExtra
 import sbt.util.Logger
 import sjsonnew.shaded.scalajson.ast.unsafe.{ JNull, JValue }
@@ -153,10 +153,18 @@ object BuildServerProtocol {
       state.value.respondEvent(result)
     }.evaluated,
     bspBuildTargetResources / aggregate := false,
-    bspBuildTargetDependencySources := bspInputTask { (_, filter) =>
+    bspBuildTargetDependencySources := bspInputTask { (workspace, filter) =>
       val items = bspBuildTargetDependencySourcesItem.result.all(filter).value
       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.value.respondEvent(result)
     }.evaluated,
     bspBuildTargetDependencySources / aggregate := false,
@@ -845,8 +853,16 @@ object BuildServerProtocol {
   }
 
   private def dependencySourcesItemTask: Def.Initialize[Task[DependencySourcesItem]] = Def.task {
-    val targetId = Keys.bspTargetIdentifier.value
-    val updateReport = Keys.updateClassifiers.value
+    getDependencySourceItem(
+      Keys.bspTargetIdentifier.value,
+      Keys.updateClassifiers.value
+    )
+  }
+
+  private def getDependencySourceItem(
+      targetId: BuildTargetIdentifier,
+      updateReport: UpdateReport
+  ): DependencySourcesItem = {
     val sources = for {
       configuration <- updateReport.configurations.view
       module <- configuration.modules.view