From bde26f6c51a098318292de05a8f7f6c4a76f0017 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sat, 25 Nov 2023 20:49:04 -0500
Subject: [PATCH] Communicate narrowing by adding case

---
 .../src/main/scala/sbt/Previous.scala         |  9 +++---
 main/src/main/scala/sbt/EvaluateTask.scala    |  5 ++--
 .../scala/sbt/internal/ClasspathImpl.scala    | 29 +++++++------------
 3 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/main-settings/src/main/scala/sbt/Previous.scala b/main-settings/src/main/scala/sbt/Previous.scala
index 95d02e5ef..b26e67dfa 100644
--- a/main-settings/src/main/scala/sbt/Previous.scala
+++ b/main-settings/src/main/scala/sbt/Previous.scala
@@ -27,7 +27,8 @@ private[sbt] final class Previous(streams: Streams, referenced: IMap[Previous.Ke
   // We can't use mapValues to transform the map because mapValues is lazy and evaluates the
   // transformation function every time a value is fetched from the map, defeating the entire
   // purpose of ReferencedValue.
-  for (referenced.TPair(k, v) <- referenced.toTypedSeq) map = map.put(k, new ReferencedValue(v))
+  for case referenced.TPair(k, v) <- referenced.toTypedSeq do
+    map = map.put(k, new ReferencedValue(v))
 
   private[this] final class ReferencedValue[T](referenced: Referenced[T]) {
     lazy val previousValue: Option[T] = referenced.read(streams)
@@ -122,10 +123,10 @@ object Previous {
 
     // We first collect all of the successful tasks and write their scoped key into a map
     // along with their values.
-    val successfulTaskResults = (for {
-      results.TPair(task, Result.Value(v)) <- results.toTypedSeq
+    val successfulTaskResults = (for
+      case results.TPair(task, Result.Value(v)) <- results.toTypedSeq
       key <- task.info.attributes.get(Def.taskDefinitionKey).asInstanceOf[Option[AnyTaskKey]]
-    } yield key -> v).toMap
+    yield key -> v).toMap
     // We then traverse the successful results and look up all of the referenced values for
     // each of these tasks. This can be a many to one relationship if multiple tasks refer
     // the previous value of another task. For each reference we find, we check if the task has
diff --git a/main/src/main/scala/sbt/EvaluateTask.scala b/main/src/main/scala/sbt/EvaluateTask.scala
index 49886c4ec..8e663f8b4 100644
--- a/main/src/main/scala/sbt/EvaluateTask.scala
+++ b/main/src/main/scala/sbt/EvaluateTask.scala
@@ -396,9 +396,8 @@ object EvaluateTask {
       }
 
     import ExceptionCategory._
-    for {
-      (key, msg, Some(ex)) <- keyed
-    } do
+    for case (key, msg, Some(ex)) <- keyed
+    do
       def log = getStreams(key, streams).log
       ExceptionCategory(ex) match {
         case AlreadyHandled => ()
diff --git a/main/src/main/scala/sbt/internal/ClasspathImpl.scala b/main/src/main/scala/sbt/internal/ClasspathImpl.scala
index 9727feb7a..cf4e769cf 100644
--- a/main/src/main/scala/sbt/internal/ClasspathImpl.scala
+++ b/main/src/main/scala/sbt/internal/ClasspathImpl.scala
@@ -335,19 +335,16 @@ private[sbt] object ClasspathImpl {
       conf: Configuration,
       data: Settings[Scope],
       deps: BuildDependencies
-  ): Seq[(ProjectRef, String)] = {
+  ): Seq[(ProjectRef, String)] =
     val visited = (new LinkedHashSet[(ProjectRef, String)]).asScala
-    def visit(p: ProjectRef, c: Configuration): Unit = {
+    def visit(p: ProjectRef, c: Configuration): Unit =
       val applicableConfigs = allConfigs(c)
-      for {
-        ac <- applicableConfigs
-      } // add all configurations in this project
+      for ac <- applicableConfigs do
+        // add all configurations in this project
         visited add (p -> ac.name)
         val masterConfs = names(getConfigurations(projectRef, data).toVector)
 
-        for {
-          ClasspathDep.ResolvedClasspathDependency(dep, confMapping) <- deps.classpath(p)
-        } {
+        for case ClasspathDep.ResolvedClasspathDependency(dep, confMapping) <- deps.classpath(p) do
           val configurations = getConfigurations(dep, data)
           val mapping =
             mapped(
@@ -358,21 +355,15 @@ private[sbt] object ClasspathImpl {
               "*->compile"
             )
           // map master configuration 'c' and all extended configurations to the appropriate dependency configuration
-          for {
+          for
             ac <- applicableConfigs
             depConfName <- mapping(ac.name)
-          } {
-            for {
-              depConf <- confOpt(configurations, depConfName)
-            } if (!visited((dep, depConfName))) {
-              visit(dep, depConf)
-            }
-          }
-        }
-    }
+          do
+            for depConf <- confOpt(configurations, depConfName) do
+              if !visited((dep, depConfName)) then visit(dep, depConf)
     visit(projectRef, conf)
     visited.toSeq
-  }
+  end interSort
 
   def mapped(
       confString: Option[String],