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

Merge pull request #8471 from xuwei-k/BuildServerProtocol-nowarn 

[2.x] Fix warnings in BuildServerProtocol.scala
This commit is contained in:
eugene yokota 2026-01-11 03:19:03 -05:00 committed by GitHub
parent 2b819e24d1 5667a46749
commit 271caaab37
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,6 @@ import scala.collection.mutable
import scala.util.control.NonFatal import scala.util.control.NonFatal
import scala.util.{ Try, Failure, Success } import scala.util.{ Try, Failure, Success }
import scala.annotation.nowarn
import sbt.testing.Framework import sbt.testing.Framework
import scala.collection.immutable.ListSet import scala.collection.immutable.ListSet
import xsbti.VirtualFileRef import xsbti.VirtualFileRef
@ -581,7 +580,6 @@ object BuildServerProtocol {
) )
) )
@nowarn
private def bspFullWorkspaceSetting: Def.Initialize[BspFullWorkspace] = private def bspFullWorkspaceSetting: Def.Initialize[BspFullWorkspace] =
Def.settingDyn { Def.settingDyn {
val loadedBuild = Keys.loadedBuild.value val loadedBuild = Keys.loadedBuild.value
@ -604,10 +602,10 @@ object BuildServerProtocol {
mutable.HashMap[BuildTargetIdentifier, mutable.ListBuffer[BuildTargetIdentifier]]() mutable.HashMap[BuildTargetIdentifier, mutable.ListBuffer[BuildTargetIdentifier]]()
val scopeMap = for { val scopeMap = for {
(targetId, scope, bspEnabled) <- (targetIds, scopes, bspEnabled).zipped (targetId, scope, bspEnabled) <- targetIds.lazyZip(scopes).lazyZip(bspEnabled)
if bspEnabled if bspEnabled
} yield { } yield {
scope.project.toOption match { (scope.project.toOption: @unchecked) match {
case Some(ProjectRef(buildUri, _)) => case Some(ProjectRef(buildUri, _)) =>
val loadedBuildUnit = loadedBuild.units(buildUri) val loadedBuildUnit = loadedBuild.units(buildUri)
buildsMap.getOrElseUpdate( buildsMap.getOrElseUpdate(
@ -625,7 +623,7 @@ object BuildServerProtocol {
} else { } else {
Nil Nil
} }
BspFullWorkspace(scopeMap.toMap, buildMap.toMap, buildsMap.mapValues(_.result()).toMap) BspFullWorkspace(scopeMap.toMap, buildMap.toMap, buildsMap.view.mapValues(_.result()).toMap)
} }
} }
@ -1014,7 +1012,6 @@ object BuildServerProtocol {
state.respondEvent(RunResult(originId, statusCode)) state.respondEvent(RunResult(originId, statusCode))
} }
@nowarn
private def internalDependencyConfigurationsSetting = Def.settingDyn { private def internalDependencyConfigurationsSetting = Def.settingDyn {
val allScopes = bspFullWorkspace.value.scopes.map { case (_, scope) => scope }.toSet val allScopes = bspFullWorkspace.value.scopes.map { case (_, scope) => scope }.toSet
val directDependencies = Keys.internalDependencyConfigurations.value val directDependencies = Keys.internalDependencyConfigurations.value
@ -1042,6 +1039,7 @@ object BuildServerProtocol {
transitiveDependencies.join.value.flatten transitiveDependencies.join.value.flatten
allDependencies allDependencies
.groupBy(_._1) .groupBy(_._1)
.view
.mapValues { deps => .mapValues { deps =>
// We use a list set to maintain the order of configs // We use a list set to maintain the order of configs
ListSet(deps.flatMap { case (_, configs) => configs }*) ListSet(deps.flatMap { case (_, configs) => configs }*)