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

BSP is part of the JVM plugin

This commit is contained in:
Adrien Piquerez 2020-05-22 11:37:36 +02:00
parent 6bce0a7b07
commit 4f00abf1ba
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/scala/sbt/Defaults.scala
View File

@ -240,7 +240,7 @@ object Defaults extends BuildCommon {
bgCopyClasspath :== true, bgCopyClasspath :== true,
closeClassLoaders :== SysProp.closeClassLoaders, closeClassLoaders :== SysProp.closeClassLoaders,
allowZombieClassLoaders :== true, allowZombieClassLoaders :== true,
) ) ++ BuildServerProtocol.globalSettings
private[sbt] lazy val globalIvyCore: Seq[Setting[_]] = private[sbt] lazy val globalIvyCore: Seq[Setting[_]] =
Seq( Seq(
@ -386,8 +386,7 @@ object Defaults extends BuildCommon {
sys.env.contains("CI") || SysProp.ci, sys.env.contains("CI") || SysProp.ci,
// watch related settings // watch related settings
pollInterval :== Watch.defaultPollInterval, pollInterval :== Watch.defaultPollInterval,
) ++ BuildServerProtocol.globalSettings ) ++ LintUnused.lintSettings
++ LintUnused.lintSettings
++ DefaultBackgroundJobService.backgroundJobServiceSettings ++ DefaultBackgroundJobService.backgroundJobServiceSettings
) )

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

@ -39,7 +39,9 @@ object BuildServerProtocol {
bspTargetConfigs.toSeq.map(name => Scope.Global.in(ref, ConfigKey(name))) bspTargetConfigs.toSeq.map(name => Scope.Global.in(ref, ConfigKey(name)))
} }
Def.setting { Def.setting {
val targetIds = scopes.map(_ / Keys.bspTargetIdentifier).join.value val targetIds = scopes.map(_ / Keys.bspTargetIdentifier)
.map(_?) // bspTargetIdentifier might no be defined if the JvmPlugin is disabled
.join.value.flatten
targetIds.zip(scopes).toMap targetIds.zip(scopes).toMap
} }
}.value, }.value,