From b1c4c09a7fc747d7a9c204f8e4a1a2435101e9a3 Mon Sep 17 00:00:00 2001 From: Friendseeker <66892505+Friendseeker@users.noreply.github.com> Date: Mon, 21 Oct 2024 16:12:11 -0700 Subject: [PATCH] Fix bunch more compiler errors --- internal/util-complete/src/test/scala/ParserTest.scala | 3 ++- main/src/main/scala/sbt/Main.scala | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/util-complete/src/test/scala/ParserTest.scala b/internal/util-complete/src/test/scala/ParserTest.scala index 5aef1f089..a3d490329 100644 --- a/internal/util-complete/src/test/scala/ParserTest.scala +++ b/internal/util-complete/src/test/scala/ParserTest.scala @@ -18,9 +18,10 @@ object JLineTest { val four = token("color" ~> Space) ~> token(ID, "") val num = token(NatBasic) - val five = (num ~ token("+" | "-") ~ num) <~ token('=') collect { + val five = (num ~ token("+" | "-") ~ num) <~ token('=') flatMap { case a ~ "+" ~ b => token((a + b).toString) case a ~ "-" ~ b => token((a - b).toString) + case _ => failure("Unexpected pattern") } val parsers = Map("1" -> one, "2" -> two, "3" -> three, "4" -> four, "5" -> five) diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala index f32e80764..ac71342df 100644 --- a/main/src/main/scala/sbt/Main.scala +++ b/main/src/main/scala/sbt/Main.scala @@ -16,6 +16,7 @@ import java.util.Properties import java.util.concurrent.ForkJoinPool import java.util.concurrent.atomic.AtomicBoolean +import sbt.BasicCommandStrings.JavaClient import sbt.Project.LoadAction import sbt.ProjectExtra.* import sbt.internal.Aggregation.AnyKeys