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

[2.x] fix dependency parsing for bsp

This commit is contained in:
Anatolii Kmetiuk 2026-07-14 11:06:53 +09:00
parent 2d2d5136ef
commit 50a6eb801f
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/main/scala/sbt/internal/InternalDependencies.scala
View File

@ -22,9 +22,9 @@ private[sbt] object InternalDependencies {
((ref -> allConfigs) +: ((ref -> allConfigs) +:
projectDependencies.flatMap { case ClasspathDep.ResolvedClasspathDependency(p, rawConfigs) => projectDependencies.flatMap { case ClasspathDep.ResolvedClasspathDependency(p, rawConfigs) =>
val configs = rawConfigs.getOrElse("*->compile").split(";").flatMap { config => val configs = rawConfigs.getOrElse("*->compile").split(";").flatMap { config =>
config.split("->") match { config.split("->", 2).map(_.trim) match {
case Array(n, c) if applicableConfigs.contains(n) => Some(c) case Array(n, c) if c.nonEmpty && applicableConfigs.contains(n) => Some(c)
case Array(n) if applicableConfigs.contains(n) => case Array(n) if applicableConfigs.contains(n) =>
// "test" is equivalent to "compile->test" // "test" is equivalent to "compile->test"
Some("compile") Some("compile")
case _ => None case _ => None

16
sbt-app/src/sbt-test/project/bsp-internal-dependency-configs/build.sbt
View File

@ -4,6 +4,10 @@ lazy val b = project.in(file("b")).dependsOn(c)
lazy val c = project.in(file("c")) lazy val c = project.in(file("c"))
lazy val d = project.in(file("d")).dependsOn(b % "test -> test")
lazy val e = project.in(file("e")).dependsOn(b % "test ->")
def getConfigs(key: SettingKey[Seq[(ProjectRef, Set[ConfigKey])]]): def getConfigs(key: SettingKey[Seq[(ProjectRef, Set[ConfigKey])]]):
Def.Initialize[Map[String, Set[String]]] = Def.Initialize[Map[String, Set[String]]] =
Def.setting(key.value.map { case (p, c) => p.project -> c.map(_.name) }.toMap) Def.setting(key.value.map { case (p, c) => p.project -> c.map(_.name) }.toMap)
@ -16,4 +20,16 @@ TaskKey[Unit]("check") := {
"c" -> Set("compile") "c" -> Set("compile")
) )
assert(testDeps == expected) assert(testDeps == expected)
val spacedTestDeps = getConfigs(d / Test / bspInternalDependencyConfigurations).value
val spacedExpected = Map(
"d" -> Set("compile", "test"),
"b" -> Set("compile", "test"),
"c" -> Set("compile")
)
assert(spacedTestDeps == spacedExpected, spacedTestDeps)
val emptyTargetDeps = getConfigs(e / Test / bspInternalDependencyConfigurations).value
val emptyTargetExpected = Map("e" -> Set("compile", "test"))
assert(emptyTargetDeps == emptyTargetExpected, emptyTargetDeps)
} }