From ae1192109d5b0ffd206f6f079c6b14ce25b995d4 Mon Sep 17 00:00:00 2001 From: eugene yokota Date: Sun, 31 May 2026 16:30:32 -0400 Subject: [PATCH] [2.0.x] ci: Scalafmt 3.11.1 (#9280) Apply Scalafmt --- .scalafmt.conf | 2 +- build.sbt | 4 +-- .../sbt/internal/util/appmacro/Cont.scala | 8 +++--- .../internal/util/appmacro/ContextUtil.scala | 8 +++--- .../scala/sbt/internal/ConvertTestMacro.scala | 2 +- .../scala/sbt/internal/util/LineReader.scala | 4 +-- .../internal/util/complete/EditDistance.scala | 2 +- .../sbt/internal/util/complete/Parser.scala | 12 ++++----- .../sbt/internal/util/complete/Parsers.scala | 2 +- .../sbt/internal/util/RunningProcesses.scala | 2 +- .../main/scala/sbt/internal/util/Util.scala | 2 +- .../sbt/internal/util/ConsoleAppender.scala | 2 +- .../scala/sbt/internal/util/EscHelpers.scala | 18 ++++++------- .../main/scala/sbt/internal/util/JLine3.scala | 4 +-- .../scala/sbt/internal/util/Terminal.scala | 6 ++--- .../internal/util/WindowsInputStream.scala | 2 +- .../main/scala/sbt/util/InterfaceUtil.scala | 4 +-- .../src/main/scala/sbt/util/Logger.scala | 2 +- .../scala/sbt/internal/util/logic/Logic.scala | 4 +-- .../src/test/scala/sbt/logic/Test.scala | 2 +- .../sbt/internal/scripted/FileCommands.scala | 4 +-- .../internal/scripted/FilteredLoader.scala | 2 +- .../internal/scripted/TestScriptParser.scala | 2 +- .../librarymanagement/IvyConfigurations.scala | 2 +- .../SemanticSelectorExtra.scala | 8 +++--- .../librarymanagement/VersionSchemes.scala | 2 +- .../cross/CrossVersionUtil.scala | 6 ++--- .../sbt/librarymanagement/ArtifactExtra.scala | 2 +- .../librarymanagement/CrossVersionExtra.scala | 10 +++---- .../DependencyResolution.scala | 2 +- .../LibraryManagementSyntax.scala | 2 +- .../sbt/librarymanagement/ModuleIDExtra.scala | 2 +- .../sbt/librarymanagement/ResolverExtra.scala | 2 +- .../librarymanagement/UpdateReportExtra.scala | 2 +- .../CoursierDependencyResolution.scala | 2 +- .../src/main/scala/lmcoursier/FromSbt.scala | 2 +- .../src/main/scala/lmcoursier/Inputs.scala | 4 +-- .../scala/lmcoursier/internal/Resolvers.scala | 3 +-- .../lmcoursier/internal/SbtUpdateReport.scala | 2 +- .../CoursierDependencyResolutionTests.scala | 10 +++---- .../scala/lmcoursier/ResolutionSpec.scala | 2 +- .../librarymanagement/ComponentManager.scala | 4 +-- .../librarymanagement/ConvertResolver.scala | 4 +-- .../librarymanagement/CustomPomParser.scala | 6 ++--- .../sbt/internal/librarymanagement/Ivy.scala | 7 +++-- .../librarymanagement/IvyActions.scala | 4 +-- .../IvyInternalDefaults.scala | 2 +- .../librarymanagement/IvyRetrieve.scala | 4 +-- .../internal/librarymanagement/MakePom.scala | 2 +- .../ivy/IvyCredentials.scala | 2 +- .../CachedResolutionResolveEngine.scala | 14 +++++----- .../ivyint/ErrorMessageAuthenticator.scala | 2 +- .../ivyint/SbtChainResolver.scala | 4 +-- .../PomExtraDependencyAttributes.scala | 4 +-- .../CustomPomParserTest.scala | 2 +- .../librarymanagement/SftpRepoSpec.scala | 2 +- main-actions/src/main/scala/sbt/Pkg.scala | 2 +- main-actions/src/main/scala/sbt/Sync.scala | 4 +-- main-actions/src/main/scala/sbt/Tests.scala | 4 +-- .../scala/sbt/internal/WorkerExchange.scala | 3 +-- .../main/scala/sbt/internal/sona/Sona.scala | 2 +- .../src/main/scala/sbt/BasicKeys.scala | 2 +- main-command/src/main/scala/sbt/Command.scala | 6 ++--- .../src/main/scala/sbt/CommandUtil.scala | 2 +- .../main/scala/sbt/ExceptionCategory.scala | 2 +- .../src/main/scala/sbt/Highlight.scala | 2 +- main-command/src/main/scala/sbt/State.scala | 8 +++--- main-command/src/main/scala/sbt/Watched.scala | 4 +-- .../scala/sbt/internal/CommandChannel.scala | 2 +- .../internal/classpath/ClassLoaderCache.scala | 6 ++--- .../sbt/internal/client/NetworkClient.scala | 26 +++++++++---------- .../scala/sbt/internal/server/Server.scala | 4 +-- .../sbt/internal/server/ServerHandler.scala | 2 +- .../main/scala/sbt/internal/ui/UITask.scala | 4 +-- .../scala/sbt/internal/ui/UserThread.scala | 6 ++--- .../util/ReadJsonFromInputStream.scala | 4 +-- main-settings/src/main/scala/sbt/Def.scala | 11 ++++---- .../src/main/scala/sbt/InputTask.scala | 2 +- .../src/main/scala/sbt/Plugins.scala | 6 ++--- .../src/main/scala/sbt/PromiseWrap.scala | 2 +- main-settings/src/main/scala/sbt/Scope.scala | 4 +-- .../main/scala/sbt/std/InputTaskMacro.scala | 4 +-- .../src/main/scala/sbt/std/SettingMacro.scala | 2 +- .../src/main/scala/sbt/std/TaskMacro.scala | 4 +-- .../src/test/scala/sbt/std/UsageTest.scala | 3 +-- main/src/main/scala/sbt/Cross.scala | 8 +++--- main/src/main/scala/sbt/Defaults.scala | 14 +++++----- main/src/main/scala/sbt/Keys.scala | 2 +- main/src/main/scala/sbt/Main.scala | 6 +++-- main/src/main/scala/sbt/MainLoop.scala | 6 ++--- main/src/main/scala/sbt/ProjectExtra.scala | 5 ++-- main/src/main/scala/sbt/SessionVar.scala | 2 +- .../main/scala/sbt/TemplateCommandUtil.scala | 10 +++---- .../sbt/coursierint/CoursierInputsTasks.scala | 2 +- .../scala/sbt/coursierint/LMCoursier.scala | 6 ++--- .../main/scala/sbt/internal/APIMappings.scala | 2 +- .../AbstractTaskExecuteProgress.scala | 2 +- main/src/main/scala/sbt/internal/Act.scala | 25 +++++++++--------- .../main/scala/sbt/internal/Aggregation.scala | 2 +- .../scala/sbt/internal/AnalysisUtil.scala | 2 +- .../main/scala/sbt/internal/BuildDef.scala | 2 +- .../main/scala/sbt/internal/BuildLoader.scala | 2 +- .../scala/sbt/internal/BuildStructure.scala | 2 +- .../scala/sbt/internal/ClassLoaders.scala | 4 +-- .../scala/sbt/internal/ClasspathImpl.scala | 6 ++--- main/src/main/scala/sbt/internal/Clean.scala | 2 +- .../scala/sbt/internal/CommandExchange.scala | 10 +++---- .../main/scala/sbt/internal/Compiler.scala | 5 ++-- .../main/scala/sbt/internal/Continuous.scala | 26 +++++++++---------- .../main/scala/sbt/internal/CrossJava.scala | 6 ++--- .../DefaultBackgroundJobService.scala | 4 +-- .../scala/sbt/internal/FileChangesMacro.scala | 2 +- .../sbt/internal/InMemoryCacheStore.scala | 2 +- .../scala/sbt/internal/IncrementalTest.scala | 2 +- .../src/main/scala/sbt/internal/Inspect.scala | 2 +- .../main/scala/sbt/internal/InstallSbtn.scala | 6 ++--- .../sbt/internal/LayeredClassLoaders.scala | 2 +- .../sbt/internal/LibraryManagement.scala | 18 ++++++------- main/src/main/scala/sbt/internal/Load.scala | 10 +++---- .../src/main/scala/sbt/internal/RunUtil.scala | 2 +- main/src/main/scala/sbt/internal/Script.scala | 2 +- .../sbt/internal/SettingCompletions.scala | 2 +- .../src/main/scala/sbt/internal/SysProp.scala | 8 +++--- .../scala/sbt/internal/TaskProgress.scala | 6 ++--- .../scala/sbt/internal/TaskSequential.scala | 2 +- .../main/scala/sbt/internal/TestCommand.scala | 2 +- .../sbt/internal/VirtualFileValueCache.scala | 2 +- .../DependencyLockManager.scala | 2 +- .../server/BuildServerEvalReporter.scala | 2 +- .../internal/server/BuildServerProtocol.scala | 6 ++--- .../sbt/internal/server/Definition.scala | 4 +-- .../sbt/internal/server/NetworkChannel.scala | 2 +- .../sbt/internal/server/VirtualTerminal.scala | 4 +-- main/src/main/scala/sbt/nio/FileStamp.scala | 2 +- main/src/main/scala/sbt/nio/Watch.scala | 6 ++--- .../sbt/plugins/DependencyTreeSettings.scala | 4 +-- main/src/test/scala/Delegates.scala | 6 ++--- main/src/test/scala/ParseKeySpec.scala | 9 ++++--- .../test/scala/sbt/internal/TestBuild.scala | 2 +- project/SbtLauncherPlugin.scala | 2 +- project/Scripted.scala | 2 +- run/src/main/scala/sbt/Fork.scala | 4 +-- run/src/main/scala/sbt/Run.scala | 2 +- run/src/main/scala/sbt/SelectMainClass.scala | 2 +- sbt-app/src/main/scala/package.scala | 2 +- .../test/scala/sbt/RunFromSourceMain.scala | 4 +-- sbtw/src/main/scala/sbtw/ConfigLoader.scala | 3 +-- sbtw/src/main/scala/sbtw/Main.scala | 2 +- .../scala/sbt/scriptedtest/SbtHandler.scala | 2 +- .../scala/testpkg/ChannelCursorTest.scala | 2 +- .../src/test/scala/testpkg/TestServer.scala | 2 +- .../src/main/scala/sbt/std/Streams.scala | 2 +- .../src/main/scala/sbt/std/TaskExtra.scala | 2 +- tasks-standard/src/test/scala/Test.scala | 2 +- tasks/src/main/scala/sbt/Execute.scala | 2 +- tasks/src/main/scala/sbt/Incomplete.scala | 2 +- .../src/main/scala/sbt/TestFramework.scala | 4 +-- .../sbt/internal/testing/TestLogger.scala | 2 +- .../scala/sbt/util/ActionCacheStore.scala | 4 +-- .../main/scala/sbt/util/CacheImplicits.scala | 4 +-- .../main/scala/sbt/internal/util/Dag.scala | 2 +- .../main/scala/sbt/internal/util/INode.scala | 6 ++--- .../src/main/scala/sbt/util/Tracked.scala | 6 ++--- .../internal/inc/ZincComponentCompiler.scala | 2 +- .../internal/inc/ZincComponentManager.scala | 2 +- 165 files changed, 356 insertions(+), 358 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index cd28122cb..ac4fa847d 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.3 +version = 3.11.1 runner.dialect = scala3 maxColumn = 100 diff --git a/build.sbt b/build.sbt index 02272b7e2..edca74b9a 100644 --- a/build.sbt +++ b/build.sbt @@ -203,10 +203,10 @@ lazy val sbtRoot: Project = (project in file(".")) val dir = nativeInstallDirectory.?.value val target = Def.spaceDelimited("").parsed.headOption match { case Some(p) => file(p).toPath - case _ => + case _ => dir match { case Some(d) => d / "sbtn" - case _ => + case _ => val msg = "Expected input parameter : installNativeExecutable /usr/local/bin" throw new IllegalStateException(msg) } diff --git a/core-macros/src/main/scala/sbt/internal/util/appmacro/Cont.scala b/core-macros/src/main/scala/sbt/internal/util/appmacro/Cont.scala index 2d8c0bb44..551887360 100644 --- a/core-macros/src/main/scala/sbt/internal/util/appmacro/Cont.scala +++ b/core-macros/src/main/scala/sbt/internal/util/appmacro/Cont.scala @@ -4,7 +4,7 @@ package util package appmacro import java.io.File -import java.nio.file.{ Path as NioPath } +import java.nio.file.Path as NioPath import scala.collection.mutable.ListBuffer import scala.reflect.ClassTag import scala.quoted.* @@ -203,7 +203,7 @@ trait Cont: $applicativeExpr.pure[A1] { () => $body } } eitherTree match - case Left(_) => pure0[Effect[A]](inner(body).asExprOf[Effect[A]]) + case Left(_) => pure0[Effect[A]](inner(body).asExprOf[Effect[A]]) case Right(_) => flatten(pure0[F[Effect[A]]](inner(body).asExprOf[F[Effect[A]]])) @@ -296,7 +296,7 @@ trait Cont: s"qual (${qual}) not found in ${inputs.map(_.qual)}" ) applyTuple(p0, br.inputTupleTypeRepr, idx) - } + } val modifiedBody = transformWrappers(body.asTerm.changeOwner(sym), substitute, sym).asExprOf[A1] cacheConfigExprOpt match @@ -467,7 +467,7 @@ trait Cont: // todo cache opt-out attribute inputBuf += Input(TypeRepr.of[a], qual, replacement, freshName("q")) oldTree - } + } val exprWithConfig = cacheConfigExprOpt.map(config => '{ $config; $expr }).getOrElse(expr) val body = transformWrappers(exprWithConfig.asTerm, record, Symbol.spliceOwner) diff --git a/core-macros/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala b/core-macros/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala index aa7b5ad6b..90363e535 100644 --- a/core-macros/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala +++ b/core-macros/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala @@ -101,7 +101,7 @@ trait ContextUtil[C <: Quotes & scala.Singleton](val valStart: Int): case Some(annot) => annot.asExprOf[cacheLevel] match case '{ cacheLevel(include = Array.empty[CacheLevelTag](using $_)) } => Nil - case '{ cacheLevel(include = Array[CacheLevelTag]($include*)) } => + case '{ cacheLevel(include = Array[CacheLevelTag]($include*)) } => include.value.get.toList case _ => sys.error(Printer.TreeStructure.show(annot) + " does not match") case _ => @@ -119,14 +119,14 @@ trait ContextUtil[C <: Quotes & scala.Singleton](val valStart: Int): case Apply(TypeApply(_, _), List(t @ Ident(_))) => t.symbol.getAnnotation(cacheLevelSym) match case Some(_) => cacheLevelsForSym(t.symbol) - case None => + case None => t.symbol.getAnnotation(transientSym) match case Some(_) => Nil case _ => CacheLevelTag.all.toList case u => u.symbol.getAnnotation(cacheLevelSym) match case Some(_) => cacheLevelsForSym(u.symbol) - case None => + case None => u.symbol.getAnnotation(transientSym) match case Some(_) => Nil case _ => CacheLevelTag.all.toList @@ -136,7 +136,7 @@ trait ContextUtil[C <: Quotes & scala.Singleton](val valStart: Int): case Some(annot) if annot.symbol.owner.name == "cacheLevel" => annot.asExprOf[cacheLevel] match case '{ cacheLevel(include = Array.empty[CacheLevelTag](using $_)) } => Nil - case '{ cacheLevel(include = Array[CacheLevelTag]($include*)) } => + case '{ cacheLevel(include = Array[CacheLevelTag]($include*)) } => include.value.get case _ => report.errorAndAbort(Printer.TreeStructure.show(annot) + " does not match") case _ => CacheLevelTag.all.toList diff --git a/core-macros/src/test/scala/sbt/internal/ConvertTestMacro.scala b/core-macros/src/test/scala/sbt/internal/ConvertTestMacro.scala index 4ed00d022..7532783d2 100644 --- a/core-macros/src/test/scala/sbt/internal/ConvertTestMacro.scala +++ b/core-macros/src/test/scala/sbt/internal/ConvertTestMacro.scala @@ -23,7 +23,7 @@ object ConvertTestMacro: (name: String, tpe: Type[a], qual: Term, replace: Term) => convert1.convert[Boolean](name, qual) transform { (tree: Term) => addTypeCon(tpe, tree, replace) - } + } convert1.transformWrappers(expr.asTerm, substitute, Symbol.spliceOwner).asExprOf[Boolean] class InputInitConvert[C <: Quotes & scala.Singleton](override val qctx: C) diff --git a/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala b/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala index a105a6ef3..3948bc10c 100644 --- a/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala +++ b/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala @@ -9,7 +9,7 @@ package sbt.internal.util import java.io.* -import java.util.{ List as JList } +import java.util.List as JList import jline.console.ConsoleReader import jline.console.history.{ FileHistory, MemoryHistory } @@ -210,7 +210,7 @@ abstract class JLine extends LineReader { val lines0 = """\r?\n""".r.split(prompt) lines0.length match { case 0 | 1 => handleProgress(prompt) - case _ => + case _ => val lines = lines0.toList map handleProgress // Workaround for regression jline/jline2#205 reader.getOutput.write(lines.init.mkString("\n") + "\n") diff --git a/internal/util-complete/src/main/scala/sbt/internal/util/complete/EditDistance.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/EditDistance.scala index 1368a2fa4..8802b755e 100644 --- a/internal/util-complete/src/main/scala/sbt/internal/util/complete/EditDistance.scala +++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/EditDistance.scala @@ -9,7 +9,7 @@ package sbt.internal.util package complete -import java.lang.Character.{ toLowerCase as lower } +import java.lang.Character.toLowerCase as lower /** @author Paul Phillips */ object EditDistance { diff --git a/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parser.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parser.scala index 9bb7781a9..db67759ab 100644 --- a/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parser.scala +++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parser.scala @@ -230,7 +230,7 @@ object Parser extends ParserMain: a.ifValid { a.result match { case Some(av) => success(f(av)) - case None => + case None => a match { case m: MapParser[?, ?] => m.map(f) case _ => new MapParser(a, f) @@ -311,7 +311,7 @@ object Parser extends ParserMain: repeated match { case _: Invalid if min == 0 => invalidButOptional case i: Invalid => i - case _ => + case _ => repeated.result match { case Some(value) => success(revAcc reverse_::: value :: Nil) // revAcc should be Nil here @@ -510,7 +510,7 @@ trait ParserMain { def loop(i: Int, a: Parser[T]): Either[() => (Seq[String], Int), T] = a match { case Invalid(f) => Left(() => (f.errors, i)) - case _ => + case _ => val ci = i + 1 if (ci >= s.length) a.resultEmpty.toEither.left.map { msgs0 => () => @@ -571,7 +571,7 @@ trait ParserMain { if (a.valid) { a.result match { case Some(av) => success(av) - case None => + case None => new ParserWithExamples(a, completions, maxNumberOfExamples, removeInvalidExamples) } } else a @@ -583,7 +583,7 @@ trait ParserMain { ): Parser[String] = t match { case i: Invalid => if (partial && seen.nonEmpty) success(seen.mkString) else i - case _ => + case _ => if (t.result.isEmpty) new MatchedString(t, seen, partial) else @@ -1022,7 +1022,7 @@ private final class Repeat[T]( lazy val resultEmpty: Result[Seq[T]] = { val partialAccumulatedOption = partial match { - case None => (Value(accumulatedReverse): Result[List[T]]) + case None => (Value(accumulatedReverse): Result[List[T]]) case Some(partialPattern) => partialPattern.resultEmpty.map(_ :: accumulatedReverse) } diff --git a/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parsers.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parsers.scala index 6341e12a3..83c0fd5a8 100644 --- a/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parsers.scala +++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parsers.scala @@ -281,7 +281,7 @@ trait Parsers { def impl(): Parser[String] = { (open ~ (notDelim ~ close).?).flatMap { case (l, Some((content, r))) => Parser.success(s"$l$content$r") - case (l, None) => + case (l, None) => ((notDelim ~ impl()).map { (leftPrefix, nestedBraces) => leftPrefix + nestedBraces }.+ ~ notDelim ~ close).map { case ((nested, suffix), r) => diff --git a/internal/util-control/src/main/scala/sbt/internal/util/RunningProcesses.scala b/internal/util-control/src/main/scala/sbt/internal/util/RunningProcesses.scala index 63ca7de4d..ce325d423 100644 --- a/internal/util-control/src/main/scala/sbt/internal/util/RunningProcesses.scala +++ b/internal/util-control/src/main/scala/sbt/internal/util/RunningProcesses.scala @@ -8,7 +8,7 @@ package sbt.internal.util -import java.lang.{ Process as JProcess } +import java.lang.Process as JProcess import java.util.concurrent.ConcurrentHashMap import scala.sys.process.Process diff --git a/internal/util-core/src/main/scala/sbt/internal/util/Util.scala b/internal/util-core/src/main/scala/sbt/internal/util/Util.scala index 3b241b27e..12a897222 100644 --- a/internal/util-core/src/main/scala/sbt/internal/util/Util.scala +++ b/internal/util-core/src/main/scala/sbt/internal/util/Util.scala @@ -85,7 +85,7 @@ object Util: lazy val javaHome: Path = sys.env.get("JAVA_HOME") match case Some(home) => Paths.get(home) - case None => + case None => if sys.props("java.home").endsWith("jre") then Paths.get(sys.props("java.home")).getParent() else Paths.get(sys.props("java.home")) diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala index e1403b484..739244b99 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala @@ -514,7 +514,7 @@ trait Appender extends AutoCloseable { contentType match { case "sbt.internal.util.TraceEvent" => appendTraceEvent(oe.message.asInstanceOf[TraceEvent]) case "sbt.internal.util.ProgressEvent" => - case _ => + case _ => LogExchange.stringCodec[AnyRef](contentType) match { case Some(codec) if contentType == "sbt.internal.util.SuccessEvent" => codec.showLines(oe.message.asInstanceOf[AnyRef]).toVector foreach { success(_) } diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/EscHelpers.scala b/internal/util-logging/src/main/scala/sbt/internal/util/EscHelpers.scala index 2d8619beb..09db26f3d 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/EscHelpers.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/EscHelpers.scala @@ -102,12 +102,12 @@ object EscHelpers { var leftDigit = -1 while (i < bytes.length) { bytes(i) match { - case 27 => state = esc + case 27 => state = esc case b if (state == esc || state == csi) && b >= 48 && b < 58 => state = csi digit += b case '[' if state == esc => state = csi - case 8 => + case 8 => state = 0 index = index - 1 case b if state == csi => @@ -165,7 +165,7 @@ object EscHelpers { state = csi digit += b case '[' if state == esc => state = csi - case 8 => + case 8 => state = 0 index = math.max(index - 1, 0) case b if state == csi => @@ -208,21 +208,21 @@ object EscHelpers { val digit = new ArrayBuffer[Byte] var leftDigit = -1 bytes.foreach { - case 27 => state = esc + case 27 => state = esc case b if (state == esc || state == csi) && b >= 48 && b < 58 => state = csi digit += b case '[' if state == esc => state = csi - case 8 => + case 8 => state = 0 index = math.max(index - 1, 0) case b if state == csi => leftDigit = Try(new String(digit.toArray).toInt).getOrElse(0) state = 0 b.toChar match { - case 'h' => index = math.max(index - 1, 0) - case 'D' => index = math.max(index - leftDigit, 0) - case 'C' => index = math.min(limit, math.min(index + leftDigit, res.length - 1)) + case 'h' => index = math.max(index - 1, 0) + case 'D' => index = math.max(index - leftDigit, 0) + case 'C' => index = math.min(limit, math.min(index + leftDigit, res.length - 1)) case 'K' | 'J' => if (leftDigit > 0) (0 until index).foreach(res(_) = 32) else res(index) = 32 @@ -232,7 +232,7 @@ object EscHelpers { } digit.clear() case b if state == esc => state = 0 - case b => + case b => res(index) = b index += 1 limit = math.max(limit, index) diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/JLine3.scala b/internal/util-logging/src/main/scala/sbt/internal/util/JLine3.scala index 0b6afa710..e9c9229cd 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/JLine3.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/JLine3.scala @@ -50,7 +50,7 @@ private[sbt] object JLine3 { var res = -2 while (i < 4 && res == -2) { inputStream.read() match { - case -1 => res = -1 + case -1 => res = -1 case byte => bytes(i) = byte.toByte i += 1 @@ -154,7 +154,7 @@ private[sbt] object JLine3 { if (buffer.isEmpty) fillBuffer() buffer.take match { case i if i == -1 => -1 - case i => + case i => buf(0) = i.toChar 1 } diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala b/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala index 6ca70cd8f..909fd09c8 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala @@ -692,7 +692,7 @@ object Terminal { override def read(b: Array[Byte]): Int = read(b, 0, b.length) override def read(b: Array[Byte], off: Int, len: Int): Int = { read() match { - case -1 => -1 + case -1 => -1 case byte => b(off) = byte.toByte 1 @@ -719,12 +719,12 @@ object Terminal { override def run(): Unit = while (running.get) { bootInputStreamHolder.get match { case null => - case is => + case is => def readFrom(inputStream: InputStream) = try { if (running.get) { inputStream.read match { - case -1 => + case -1 => case `NO_BOOT_CLIENTS_CONNECTED` => if (!Terminal.hasConsole) { result.put(-1) diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/WindowsInputStream.scala b/internal/util-logging/src/main/scala/sbt/internal/util/WindowsInputStream.scala index cc2667657..a46595aab 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/WindowsInputStream.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/WindowsInputStream.scala @@ -62,7 +62,7 @@ private[util] class WindowsInputStream(term: org.jline.terminal.Terminal, in: In */ private def readConsoleInput(): Array[Byte] = { WindowsSupport.readConsoleInput(1) match { - case null => Array.empty + case null => Array.empty case events => val sb = new StringBuilder(); events.foreach { event => diff --git a/internal/util-logging/src/main/scala/sbt/util/InterfaceUtil.scala b/internal/util-logging/src/main/scala/sbt/util/InterfaceUtil.scala index 74b47cc77..7fee02a82 100644 --- a/internal/util-logging/src/main/scala/sbt/util/InterfaceUtil.scala +++ b/internal/util-logging/src/main/scala/sbt/util/InterfaceUtil.scala @@ -11,7 +11,7 @@ package sbt.util import java.io.File import java.util.Optional import java.util.function.Supplier -import java.{ util as ju } +import java.util as ju import xsbti.{ Action, @@ -32,7 +32,7 @@ object InterfaceUtil { override def get: A = a } - import java.util.function.{ Function as JavaFunction } + import java.util.function.Function as JavaFunction def toJavaFunction[A1, R](f: A1 => R): JavaFunction[A1, R] = (t: A1) => f(t) diff --git a/internal/util-logging/src/main/scala/sbt/util/Logger.scala b/internal/util-logging/src/main/scala/sbt/util/Logger.scala index 39db3f63b..2c4253dcc 100644 --- a/internal/util-logging/src/main/scala/sbt/util/Logger.scala +++ b/internal/util-logging/src/main/scala/sbt/util/Logger.scala @@ -8,7 +8,7 @@ package sbt.util -import xsbti.{ Logger as xLogger } +import xsbti.Logger as xLogger import sys.process.ProcessLogger import sbt.internal.util.{ BufferedLogger, FullLogger } diff --git a/internal/util-logic/src/main/scala/sbt/internal/util/logic/Logic.scala b/internal/util-logic/src/main/scala/sbt/internal/util/logic/Logic.scala index aadb88c83..3668dafc9 100644 --- a/internal/util-logic/src/main/scala/sbt/internal/util/logic/Logic.scala +++ b/internal/util-logic/src/main/scala/sbt/internal/util/logic/Logic.scala @@ -245,7 +245,7 @@ object Logic { state: Matched ): Matched = applyAll(clauses, factsToProcess) match { - case None => state // all of the remaining clauses failed on the new facts + case None => state // all of the remaining clauses failed on the new facts case Some(applied) => val (proven, unprovenClauses) = findProven(applied) val processedFacts = state.add(keepPositive(factsToProcess)) @@ -397,7 +397,7 @@ object Logic { else (And(newLits): Formula) Some(newF) // 1. } - case True => Some(True) + case True => Some(True) case lit: Literal => // define in terms of And substitute(And(Set(lit)), facts) } diff --git a/internal/util-logic/src/test/scala/sbt/logic/Test.scala b/internal/util-logic/src/test/scala/sbt/logic/Test.scala index 3eb66dde3..5649ce7ee 100644 --- a/internal/util-logic/src/test/scala/sbt/logic/Test.scala +++ b/internal/util-logic/src/test/scala/sbt/logic/Test.scala @@ -35,7 +35,7 @@ object LogicTest extends Properties("Logic") { */ def expect(result: Either[LogicException, Matched], expected: Set[Atom]) = result match { - case Left(_) => false + case Left(_) => false case Right(res) => val actual = res.provenSet if (actual != expected) diff --git a/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala b/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala index 1a6fd47b2..8a5c34412 100644 --- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala +++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala @@ -70,7 +70,7 @@ class FileCommands(baseDirectory: File) extends BasicStatementHandler { val combined = globs(exprs1) match case Nil => sys.error("unexpected Nil") case g :: Nil => g - case g :: gs => + case g :: gs => gs.foldLeft(g) { (acc, g) => acc || g } @@ -164,7 +164,7 @@ class FileCommands(baseDirectory: File) extends BasicStatementHandler { commandName -> { case Nil => scriptError("No paths specified for " + commandName + " command.") case path :: Nil => scriptError("No destination specified for " + commandName + " command.") - case paths => + case paths => val mapped = fromStrings(paths) val map = mapper(mapped.last) IO.copy(mapped.init.pair(map)) diff --git a/internal/util-scripted/src/main/scala/sbt/internal/scripted/FilteredLoader.scala b/internal/util-scripted/src/main/scala/sbt/internal/scripted/FilteredLoader.scala index 7dfe41279..efaa8a6d8 100644 --- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/FilteredLoader.scala +++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/FilteredLoader.scala @@ -10,7 +10,7 @@ package sbt package internal package scripted -import java.{ util as ju } +import java.util as ju import java.net.URL final class FilteredLoader(parent: ClassLoader) extends ClassLoader(parent) { diff --git a/internal/util-scripted/src/main/scala/sbt/internal/scripted/TestScriptParser.scala b/internal/util-scripted/src/main/scala/sbt/internal/scripted/TestScriptParser.scala index b23887d6b..faa04cb44 100644 --- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/TestScriptParser.scala +++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/TestScriptParser.scala @@ -68,7 +68,7 @@ class TestScriptParser(handlers: Map[Char, StatementHandler]) extends RegexParse ): List[(StatementHandler, Statement)] = { parseAll(statements(stripQuotes), script) match { case Success(result, next) => result - case err: NoSuccess => { + case err: NoSuccess => { val labelString = label.map("'" + _ + "' ").getOrElse("") sys.error("Could not parse test script, " + labelString + err.toString) } diff --git a/lm-core/src/main/scala/sbt/internal/librarymanagement/IvyConfigurations.scala b/lm-core/src/main/scala/sbt/internal/librarymanagement/IvyConfigurations.scala index aac26548d..766ee55d4 100644 --- a/lm-core/src/main/scala/sbt/internal/librarymanagement/IvyConfigurations.scala +++ b/lm-core/src/main/scala/sbt/internal/librarymanagement/IvyConfigurations.scala @@ -10,7 +10,7 @@ private[librarymanagement] abstract class InlineConfigurationFunctions { ) = if (explicitConfigurations.isEmpty) { defaultConfiguration match { - case Some(Configurations.DefaultIvyConfiguration) => Configurations.Default :: Nil + case Some(Configurations.DefaultIvyConfiguration) => Configurations.Default :: Nil case Some(Configurations.DefaultMavenConfiguration) => Configurations.defaultMavenConfigurations case _ => Nil diff --git a/lm-core/src/main/scala/sbt/internal/librarymanagement/SemanticSelectorExtra.scala b/lm-core/src/main/scala/sbt/internal/librarymanagement/SemanticSelectorExtra.scala index cb3fcdc57..036fa3483 100644 --- a/lm-core/src/main/scala/sbt/internal/librarymanagement/SemanticSelectorExtra.scala +++ b/lm-core/src/main/scala/sbt/internal/librarymanagement/SemanticSelectorExtra.scala @@ -125,9 +125,9 @@ private[librarymanagement] abstract class SemComparatorExtra { // Identifiers consisting of only digits are compared numerically. // Numeric identifiers always have lower precedence than non-numeric identifiers. // Identifiers with letters are compared case-insensitive lexical order. - case (true, true) => implicitly[Ordering[Long]].compare(ts1head.toLong, ts2head.toLong) - case (false, true) => 1 - case (true, false) => -1 + case (true, true) => implicitly[Ordering[Long]].compare(ts1head.toLong, ts2head.toLong) + case (false, true) => 1 + case (true, false) => -1 case (false, false) => ts1head.toLowerCase(Locale.ENGLISH).compareTo(ts2head.toLowerCase(Locale.ENGLISH)) } @@ -195,7 +195,7 @@ private[librarymanagement] abstract class SemComparatorFunctions { case Some(">=") => Gte case Some("=") => Eq case None => Eq - case Some(_) => + case Some(_) => throw new IllegalArgumentException(s"Invalid operator: $opStr") } SemComparator( diff --git a/lm-core/src/main/scala/sbt/internal/librarymanagement/VersionSchemes.scala b/lm-core/src/main/scala/sbt/internal/librarymanagement/VersionSchemes.scala index 112420028..685894312 100644 --- a/lm-core/src/main/scala/sbt/internal/librarymanagement/VersionSchemes.scala +++ b/lm-core/src/main/scala/sbt/internal/librarymanagement/VersionSchemes.scala @@ -23,7 +23,7 @@ private[sbt] object VersionSchemes { def validateScheme(value: String): Unit = value match { case EarlySemVer | SemVerSpec | PackVer | Strict | Always => () - case "semver" => + case "semver" => sys.error( s"""'semver' is ambiguous. |Based on the Semantic Versioning 2.0.0, 0.y.z updates are all initial development and thus diff --git a/lm-core/src/main/scala/sbt/internal/librarymanagement/cross/CrossVersionUtil.scala b/lm-core/src/main/scala/sbt/internal/librarymanagement/cross/CrossVersionUtil.scala index 2726c9273..6e6630e01 100644 --- a/lm-core/src/main/scala/sbt/internal/librarymanagement/cross/CrossVersionUtil.scala +++ b/lm-core/src/main/scala/sbt/internal/librarymanagement/cross/CrossVersionUtil.scala @@ -84,7 +84,7 @@ object CrossVersionUtil { private[sbt] def binaryScala3Version(full: String): String = full match { case ReleaseV(maj, _, _, _) => maj case NonReleaseV_n(maj, min, patch, _) if min.toLong > 0 || patch.toLong > 0 => maj - case BinCompatV(maj, min, patch, stageOrNull, _) => + case BinCompatV(maj, min, patch, stageOrNull, _) => val stage = if (stageOrNull != null) stageOrNull else "" binaryScala3Version(s"$maj.$min.$patch$stage") case _ => full @@ -118,7 +118,7 @@ object CrossVersionUtil { def binaryScalaVersion(full: String): String = full match { // Handle dynamic Scala 3 version patterns like "3-latest.candidate" - case DynamicScala3V(maj) => maj + case DynamicScala3V(maj) => maj case _ if full.startsWith("2.") => binaryVersionWithApi(full, TransitionScalaVersion)( scalaApiVersion @@ -135,7 +135,7 @@ object CrossVersionUtil { def earlyScalaVersion(full: String): String = full match { // Handle dynamic Scala 3 version patterns like "3-latest.candidate" - case DynamicScala3V(maj) => maj + case DynamicScala3V(maj) => maj case _ if full.startsWith("2.") => partialVersion(full) match case Some((major, minor)) => s"$major.$minor" diff --git a/lm-core/src/main/scala/sbt/librarymanagement/ArtifactExtra.scala b/lm-core/src/main/scala/sbt/librarymanagement/ArtifactExtra.scala index c96da0fa4..8aa062237 100644 --- a/lm-core/src/main/scala/sbt/librarymanagement/ArtifactExtra.scala +++ b/lm-core/src/main/scala/sbt/librarymanagement/ArtifactExtra.scala @@ -106,7 +106,7 @@ private[librarymanagement] abstract class ArtifactFunctions { val cross = CrossVersion(module.crossVersion, scalaVersion.full, scalaVersion.binary) val withPlatform = module.crossVersion match { case _: Disabled => artifact.name - case _ => + case _ => module.platformOpt match { case Some(p) if p.nonEmpty && p != Platform.jvm => s"${artifact.name}_$p" case _ => artifact.name diff --git a/lm-core/src/main/scala/sbt/librarymanagement/CrossVersionExtra.scala b/lm-core/src/main/scala/sbt/librarymanagement/CrossVersionExtra.scala index 6b1035ada..c9d3d5db3 100644 --- a/lm-core/src/main/scala/sbt/librarymanagement/CrossVersionExtra.scala +++ b/lm-core/src/main/scala/sbt/librarymanagement/CrossVersionExtra.scala @@ -122,11 +122,11 @@ private[librarymanagement] abstract class CrossVersionFunctions { binaryVersion: String ): Option[String => String] = cross match { - case _: Disabled => None - case b: Binary => append(b.prefix + binaryVersion + b.suffix) - case c: Constant => append(c.value) - case _: Patch => append(patchFun(fullVersion)) - case f: Full => append(f.prefix + fullVersion + f.suffix) + case _: Disabled => None + case b: Binary => append(b.prefix + binaryVersion + b.suffix) + case c: Constant => append(c.value) + case _: Patch => append(patchFun(fullVersion)) + case f: Full => append(f.prefix + fullVersion + f.suffix) case c: For3Use2_13 => val compat = if (binaryVersion == "3" || binaryVersion.startsWith("3.0.0")) "2.13" diff --git a/lm-core/src/main/scala/sbt/librarymanagement/DependencyResolution.scala b/lm-core/src/main/scala/sbt/librarymanagement/DependencyResolution.scala index 05b1fc122..e015f1c03 100644 --- a/lm-core/src/main/scala/sbt/librarymanagement/DependencyResolution.scala +++ b/lm-core/src/main/scala/sbt/librarymanagement/DependencyResolution.scala @@ -128,7 +128,7 @@ class DependencyResolution private[sbt] (lmEngine: DependencyResolutionInterface log ) match { case Left(unresolvedWarning) => Left(unresolvedWarning) - case Right(updateReport) => + case Right(updateReport) => val allFiles = for { conf <- updateReport.configurations diff --git a/lm-core/src/main/scala/sbt/librarymanagement/LibraryManagementSyntax.scala b/lm-core/src/main/scala/sbt/librarymanagement/LibraryManagementSyntax.scala index 6a3633c61..d37764b3e 100644 --- a/lm-core/src/main/scala/sbt/librarymanagement/LibraryManagementSyntax.scala +++ b/lm-core/src/main/scala/sbt/librarymanagement/LibraryManagementSyntax.scala @@ -26,7 +26,7 @@ trait LibraryManagementSyntax type InclusionRule = InclExclRule final val InclusionRule = InclExclRule - import sbt.librarymanagement.{ Configurations as C } + import sbt.librarymanagement.Configurations as C final val Compile = C.Compile final val Test = C.Test final val Runtime = C.Runtime diff --git a/lm-core/src/main/scala/sbt/librarymanagement/ModuleIDExtra.scala b/lm-core/src/main/scala/sbt/librarymanagement/ModuleIDExtra.scala index 5d7520948..9fe124edf 100644 --- a/lm-core/src/main/scala/sbt/librarymanagement/ModuleIDExtra.scala +++ b/lm-core/src/main/scala/sbt/librarymanagement/ModuleIDExtra.scala @@ -87,7 +87,7 @@ private[librarymanagement] abstract class ModuleIDExtra { */ def cross(v: CrossVersion): ModuleID = withCrossVersion(CrossVersion.getPrefixSuffix(this.crossVersion) match { - case ("", "") => v + case ("", "") => v case (prefix, suffix) => CrossVersion.getPrefixSuffix(v) match { case ("", "") => CrossVersion.setPrefixSuffix(v, prefix, suffix) diff --git a/lm-core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala b/lm-core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala index 635028b63..89ec3bd48 100644 --- a/lm-core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala +++ b/lm-core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala @@ -417,7 +417,7 @@ private[librarymanagement] abstract class ResolverFunctions { // Occurs inside File constructor when property or environment variable does not exist case _: NullPointerException => None // Occurs when File does not exist - case _: IOException => None + case _: IOException => None case e: SAXParseException => System.err.println(s"WARNING: Problem parsing ${f().getAbsolutePath}, ${e.getMessage}"); None diff --git a/lm-core/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala b/lm-core/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala index 4cbd69cdb..83f30a58b 100644 --- a/lm-core/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala +++ b/lm-core/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala @@ -4,7 +4,7 @@ package sbt.librarymanagement import java.io.File -import java.{ util as ju } +import java.util as ju private[librarymanagement] abstract class ConfigurationReportExtra { def configuration: ConfigRef diff --git a/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala b/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala index beb7dfa23..80938ddda 100644 --- a/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala +++ b/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala @@ -375,7 +375,7 @@ class CoursierDependencyResolution( case Some(lockData) => LockedArtifactsRun.fetchFromLockFile(lockData, cache0, verbosityLevel, log) match { case Right(arts) => Right(arts) - case Left(err) => + case Left(err) => if (verbosityLevel >= 1) { log.warn(s"Failed to fetch from lock file: $err, falling back to normal fetch") } diff --git a/lm-coursier/src/main/scala/lmcoursier/FromSbt.scala b/lm-coursier/src/main/scala/lmcoursier/FromSbt.scala index 8f346d1db..96173ac46 100644 --- a/lm-coursier/src/main/scala/lmcoursier/FromSbt.scala +++ b/lm-coursier/src/main/scala/lmcoursier/FromSbt.scala @@ -1,6 +1,6 @@ package lmcoursier -import coursier.ivy.IvyXml.{ mappings as ivyXmlMappings } +import coursier.ivy.IvyXml.mappings as ivyXmlMappings import lmcoursier.definitions.{ Classifier, Configuration, diff --git a/lm-coursier/src/main/scala/lmcoursier/Inputs.scala b/lm-coursier/src/main/scala/lmcoursier/Inputs.scala index 561e0df5f..b7022aa90 100644 --- a/lm-coursier/src/main/scala/lmcoursier/Inputs.scala +++ b/lm-coursier/src/main/scala/lmcoursier/Inputs.scala @@ -1,6 +1,6 @@ package lmcoursier -import coursier.ivy.IvyXml.{ mappings as initialIvyXmlMappings } +import coursier.ivy.IvyXml.mappings as initialIvyXmlMappings import lmcoursier.definitions.{ Configuration, Module, ModuleName, Organization } import sbt.librarymanagement.{ CrossVersion, InclExclRule, ModuleID } import sbt.util.Logger @@ -57,7 +57,7 @@ object Inputs { toAdd: List[Configuration] ): LazyList[(Configuration, Seq[Configuration])] = toAdd match { - case Nil => LazyList.empty + case Nil => LazyList.empty case config :: rest => val extends0 = map.getOrElse(config, Nil) val missingExtends = extends0.filterNot(done) diff --git a/lm-coursier/src/main/scala/lmcoursier/internal/Resolvers.scala b/lm-coursier/src/main/scala/lmcoursier/internal/Resolvers.scala index 936cef804..ac97f8115 100644 --- a/lm-coursier/src/main/scala/lmcoursier/internal/Resolvers.scala +++ b/lm-coursier/src/main/scala/lmcoursier/internal/Resolvers.scala @@ -118,8 +118,7 @@ object Resolvers { case r: URLRepository if patternMatchGuard(r.patterns) => parseMavenCompatResolver(log, ivyProperties, authentication, r.patterns, classLoaders) - case raw: RawRepository - if raw.name == "inter-project" => // sbt.RawRepository.equals just compares names anyway + case raw: RawRepository if raw.name == "inter-project" => // sbt.RawRepository.equals just compares names anyway None // Pattern Match resolver-type-specific RawRepositories diff --git a/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala b/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala index 86e13d10a..999b56317 100644 --- a/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala +++ b/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala @@ -239,7 +239,7 @@ private[internal] object SbtUpdateReport { def lookupProject(mv: coursier.core.Resolution.ModuleVersion): Option[Project] = res.projectCache.get(mv) match { case Some((_, p)) => Some(p) - case _ => + case _ => interProjectDependencies.find(p => mv == (p.module, p.version)) } diff --git a/lm-coursier/src/test/scala/lmcoursier/CoursierDependencyResolutionTests.scala b/lm-coursier/src/test/scala/lmcoursier/CoursierDependencyResolutionTests.scala index ed258e8ab..da164ffc3 100644 --- a/lm-coursier/src/test/scala/lmcoursier/CoursierDependencyResolutionTests.scala +++ b/lm-coursier/src/test/scala/lmcoursier/CoursierDependencyResolutionTests.scala @@ -67,7 +67,7 @@ class CoursierDependencyResolutionTests extends AnyPropSpec with Matchers { val module = depRes.moduleDescriptor(desc) depRes.update(module, UpdateConfiguration(), UnresolvedWarningConfiguration(), logger) match { - case Left(x) => throw x.resolveException + case Left(x) => throw x.resolveException case Right(x) => x.allModules.collect { case m: ModuleID if m.organization == scalaModule212.organization && m.name == m.name => @@ -87,7 +87,7 @@ class CoursierDependencyResolutionTests extends AnyPropSpec with Matchers { val module = depRes.moduleDescriptor(desc) depRes.update(module, UpdateConfiguration(), UnresolvedWarningConfiguration(), logger) match { - case Left(x) => throw x.resolveException + case Left(x) => throw x.resolveException case Right(x) => x.allModules.collect { case m: ModuleID if m.organization == scalaModule212.organization && m.name == m.name => @@ -108,7 +108,7 @@ class CoursierDependencyResolutionTests extends AnyPropSpec with Matchers { val module = depRes.moduleDescriptor(desc) depRes.update(module, UpdateConfiguration(), UnresolvedWarningConfiguration(), logger) match { - case Left(x) => throw x.resolveException + case Left(x) => throw x.resolveException case Right(x) => x.allModules.collect { case m: ModuleID if m.organization == scalaModule212.organization && m.name == m.name => @@ -130,7 +130,7 @@ class CoursierDependencyResolutionTests extends AnyPropSpec with Matchers { val module = depRes.moduleDescriptor(desc) depRes.update(module, UpdateConfiguration(), UnresolvedWarningConfiguration(), logger) match { - case Left(x) => throw x.resolveException + case Left(x) => throw x.resolveException case Right(x) => x.allModules.collect { case m: ModuleID if m.organization == scalaModule212.organization && m.name == m.name => @@ -154,7 +154,7 @@ class CoursierDependencyResolutionTests extends AnyPropSpec with Matchers { val module = depRes.moduleDescriptor(desc) depRes.update(module, UpdateConfiguration(), UnresolvedWarningConfiguration(), logger) match { - case Left(x) => throw x.resolveException + case Left(x) => throw x.resolveException case Right(x) => x.allModules.collect { case m: ModuleID if m.organization == scalaModule212.organization && m.name == m.name => diff --git a/lm-coursier/src/test/scala/lmcoursier/ResolutionSpec.scala b/lm-coursier/src/test/scala/lmcoursier/ResolutionSpec.scala index e940a4208..87bd6b83f 100644 --- a/lm-coursier/src/test/scala/lmcoursier/ResolutionSpec.scala +++ b/lm-coursier/src/test/scala/lmcoursier/ResolutionSpec.scala @@ -53,7 +53,7 @@ final class ResolutionSpec extends AnyPropSpec with Matchers { private def unresolvedWarningLines(module: ModuleDescriptor): Seq[String] = lmEngine.update(module, UpdateConfiguration(), UnresolvedWarningConfiguration(), log) match { - case Left(uw) => uw.lines + case Left(uw) => uw.lines case Right(report) => fail(s"Expected resolution to fail, but it succeeded with report: $report") } diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ComponentManager.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ComponentManager.scala index fa4cd850f..c8eefd1d7 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ComponentManager.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ComponentManager.scala @@ -43,7 +43,7 @@ class ComponentManager( def notFound = invalid("Could not find required component '" + id + "'") def createAndCache = ifMissing match { - case IfMissing.Fail => notFound + case IfMissing.Fail => notFound case d: IfMissing.Define => d() if (d.cache) cache(id) @@ -65,7 +65,7 @@ class ComponentManager( def file(id: String)(ifMissing: IfMissing): File = files(id)(ifMissing).toList match { case x :: Nil => x - case xs => + case xs => invalid("Expected single file for component '" + id + "', found: " + xs.mkString(", ")) } private def invalid(msg: String) = throw new InvalidComponent(msg) diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala index 81cb1c435..81d559a36 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala @@ -24,12 +24,12 @@ import org.apache.ivy.plugins.resolver.{ SshResolver, URLResolver } -import org.apache.ivy.plugins.repository.url.{ URLRepository as URLRepo } +import org.apache.ivy.plugins.repository.url.URLRepository as URLRepo import org.apache.ivy.plugins.repository.file.{ FileResource, FileRepository as FileRepo } import java.io.{ File, IOException } import java.util.Date -import org.apache.ivy.core.module.descriptor.{ Artifact as IArtifact } +import org.apache.ivy.core.module.descriptor.Artifact as IArtifact import org.apache.ivy.core.module.id.ModuleRevisionId import org.apache.ivy.core.module.descriptor.DefaultArtifact import org.apache.ivy.core.report.DownloadReport diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/CustomPomParser.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/CustomPomParser.scala index b610282f0..2d1e6cd08 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/CustomPomParser.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/CustomPomParser.scala @@ -139,8 +139,7 @@ object CustomPomParser { (Option(extraInfo.get(TransformedHashKey)) .orElse(Option(extraInfo.get(oldTransformedHashKey))) match case Some(MyHash) => true - case _ => false - ) + case _ => false) } private def defaultTransformImpl( @@ -315,8 +314,7 @@ object CustomPomParser { addExtra(dd, dependencyExtra) } val withVersionRangeMod: Seq[DependencyDescriptor] = - if (LMSysProp.modifyVersionRange) withExtra map { stripVersionRange } - else withExtra + if (LMSysProp.modifyVersionRange) withExtra map { stripVersionRange } else withExtra val unique = IvySbt.mergeDuplicateDefinitions(withVersionRangeMod) unique foreach dmd.addDependency diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala index fcec2c721..cb7e2557a 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala @@ -674,7 +674,7 @@ private[sbt] object IvySbt { settings.setDefaultRepositoryCacheManager(manager) } def toIvyConfiguration(configuration: Configuration) = { - import org.apache.ivy.core.module.descriptor.{ Configuration as IvyConfig } + import org.apache.ivy.core.module.descriptor.Configuration as IvyConfig import IvyConfig.Visibility.* import configuration.* new IvyConfig( @@ -758,7 +758,7 @@ private[sbt] object IvySbt { (m: ModuleID) => m.crossVersion match case _: Disabled => m - case _ => + case _ => (platform, m.platformOpt) match case (Some(p), None) => addSuffix(m, p) case (_, Some(p)) => addSuffix(m, p) @@ -812,8 +812,7 @@ private[sbt] object IvySbt { } private[sbt] def javaMap(m: Map[String, String], unqualify: Boolean = false) = { import scala.jdk.CollectionConverters.* - val map = if (unqualify) m map { (k, v) => (k.stripPrefix("e:"), v) } - else m + val map = if (unqualify) m map { (k, v) => (k.stripPrefix("e:"), v) } else m if (map.isEmpty) null else map.asJava } diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala index 9c077ca9d..0048a79eb 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala @@ -18,7 +18,7 @@ import org.apache.ivy.core.module.descriptor.{ } import org.apache.ivy.core.resolve.ResolveOptions import org.apache.ivy.plugins.resolver.{ BasicResolver, DependencyResolver } -import org.apache.ivy.util.filter.{ Filter as IvyFilter } +import org.apache.ivy.util.filter.Filter as IvyFilter import sbt.io.{ IO, PathFinder } import sbt.util.Logger import sbt.librarymanagement.{ ModuleDescriptorConfiguration as InlineConfiguration, * } @@ -149,7 +149,7 @@ object IvyActions { case Some(overrideRev) => def updateAttrs(metadata: scala.xml.MetaData): scala.xml.MetaData = { metadata match { - case scala.xml.Null => scala.xml.Null + case scala.xml.Null => scala.xml.Null case attr if attr.key == "rev" => new scala.xml.UnprefixedAttribute( "rev", diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyInternalDefaults.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyInternalDefaults.scala index 501a02496..399b13427 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyInternalDefaults.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyInternalDefaults.scala @@ -4,7 +4,7 @@ package internal.librarymanagement import java.io.File import sbt.librarymanagement.IvyPaths import sbt.io.syntax.* -import xsbti.{ Logger as XLogger } +import xsbti.Logger as XLogger import sbt.util.Logger /** diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyRetrieve.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyRetrieve.scala index d939ddbad..d2ac42ea5 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyRetrieve.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyRetrieve.scala @@ -4,7 +4,7 @@ package sbt.internal.librarymanagement import java.io.File -import java.{ util as ju } +import java.util as ju import collection.mutable import collection.immutable.ArraySeq import org.apache.ivy.core.{ module, report, resolve } @@ -12,7 +12,7 @@ import module.descriptor.{ Artifact as IvyArtifact, License as IvyLicense } import module.id.{ ModuleRevisionId, ModuleId as IvyModuleId } import report.{ ArtifactDownloadReport, ConfigurationResolveReport, ResolveReport } import resolve.{ IvyNode, IvyNodeCallers } -import IvyNodeCallers.{ Caller as IvyCaller } +import IvyNodeCallers.Caller as IvyCaller import ivyint.SbtDefaultDependencyDescriptor import sbt.librarymanagement.*, syntax.* diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala index 819e8fe57..44e90b682 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala @@ -238,7 +238,7 @@ class MakePom(val log: Logger) { module.getAllArtifacts match { case Array() => "pom" case Array(x) => x.getType - case xs => + case xs => val types = xs.map(_.getType).toList.filterNot(IgnoreTypes) types match { case Nil => Artifact.PomType diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivy/IvyCredentials.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivy/IvyCredentials.scala index 0d8f61dea..64cfabdb5 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivy/IvyCredentials.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivy/IvyCredentials.scala @@ -28,7 +28,7 @@ object IvyCredentials { def allDirect(sc: Seq[Credentials]): Seq[Credentials.DirectCredentials] = sc map toDirect def toDirect(c: Credentials): Credentials.DirectCredentials = c match { case dc: Credentials.DirectCredentials => dc - case fc: Credentials.FileCredentials => + case fc: Credentials.FileCredentials => loadCredentials(fc.path) match { case Left(err) => sys.error(err) case Right(dc) => dc diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala index 52cd94b6c..e4811052e 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala @@ -24,7 +24,7 @@ import core.module.descriptor.{ import core.module.descriptor.{ OverrideDependencyDescriptorMediator, DependencyArtifactDescriptor } import core.IvyPatternHelper import org.apache.ivy.util.{ Message, MessageLogger } -import org.apache.ivy.plugins.latest.{ ArtifactInfo as IvyArtifactInfo } +import org.apache.ivy.plugins.latest.ArtifactInfo as IvyArtifactInfo import org.apache.ivy.plugins.matcher.{ MapMatcher, PatternMatcher } import annotation.tailrec import scala.concurrent.duration.* @@ -295,10 +295,10 @@ private[sbt] class CachedResolutionResolveCache { } (conflictCache get ((cf0, cf1))) match { case Some((surviving, evicted, mgr)) => reconstructReports(surviving, evicted, mgr) - case _ => + case _ => (conflictCache get ((cf1, cf0))) match { case Some((surviving, evicted, mgr)) => reconstructReports(surviving, evicted, mgr) - case _ => + case _ => val (surviving, evicted, mgr) = f if (conflictCache.size > maxConflictCacheSize) { conflictCache.remove(conflictCache.head._1) @@ -629,7 +629,7 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine { allModules0.to(mutable.Map) @tailrec def breakLoops(loops: List[List[(String, String)]]): Unit = loops match { - case Nil => () + case Nil => () case loop :: rest => loop match { case Nil => @@ -717,7 +717,7 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine { allModules: Map[(String, String), Vector[OrganizationArtifactReport]] ): List[OrganizationArtifactReport] = cs match { - case Nil => Nil + case Nil => Nil case (organization, name) :: rest => val reports = allModules((organization, name)) reports match { @@ -820,7 +820,7 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine { val reports: Seq[((String, String), Vector[OrganizationArtifactReport])] = reports0.toSeq flatMap { case (k, _) if !(pairs.contains[(String, String)](k)) => Seq() - case ((organization, name), oars0) => + case ((organization, name), oars0) => val oars = oars0 map { oar => val (affected, unaffected) = oar.modules partition { mr => val x = !mr.evicted && mr.problem.isEmpty && isTransitivelyEvicted(mr) @@ -940,7 +940,7 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine { } case _ => getSettings.getConflictManager(IvyModuleId.newInstance(organization, name)) match { - case ncm: NoConflictManager => (conflicts, Vector(), ncm.toString) + case ncm: NoConflictManager => (conflicts, Vector(), ncm.toString) case _: StrictConflictManager => sys.error( (s"conflict was found in $rootModuleConf:$organization:$name " + (conflicts map { diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ErrorMessageAuthenticator.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ErrorMessageAuthenticator.scala index 1aa1dfa8f..20cea310c 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ErrorMessageAuthenticator.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ErrorMessageAuthenticator.scala @@ -99,7 +99,7 @@ object ErrorMessageAuthenticator { def doInstallIfIvy(original: Option[Authenticator]): Unit = original match { case Some(_: ErrorMessageAuthenticator) => // Ignore, we're already installed - case Some(ivy: IvyAuthenticator) => + case Some(ivy: IvyAuthenticator) => installIntoIvy(ivy); () case original => doInstall(original) } diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/SbtChainResolver.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/SbtChainResolver.scala index c91a5db65..457953f97 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/SbtChainResolver.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/SbtChainResolver.scala @@ -11,7 +11,7 @@ import org.apache.ivy.core.{ IvyContext, LogOptions } import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor import org.apache.ivy.core.module.descriptor.DependencyDescriptor import org.apache.ivy.core.module.descriptor.ModuleDescriptor -import org.apache.ivy.core.module.descriptor.{ Artifact as IArtifact } +import org.apache.ivy.core.module.descriptor.Artifact as IArtifact import org.apache.ivy.core.resolve.{ ResolveData, ResolvedModuleRevision } import org.apache.ivy.plugins.latest.LatestStrategy import org.apache.ivy.plugins.repository.file.{ FileResource, FileRepository as IFileRepository } @@ -199,7 +199,7 @@ private[sbt] case class SbtChainResolver( val chosenPublicationDate = Option(publicationDate).orElse(Option(descriptorDate)) chosenPublicationDate match { case Some(date) => date.getTime - case None => + case None => val id = rmr.getId val resolvedResource = (resolver.findIvyFileRef(descriptor, data), rmr.getDescriptor) resolvedResource match { diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/mavenint/PomExtraDependencyAttributes.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/mavenint/PomExtraDependencyAttributes.scala index 0161aae5e..9b1f6a1c7 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/mavenint/PomExtraDependencyAttributes.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/mavenint/PomExtraDependencyAttributes.scala @@ -38,7 +38,7 @@ object PomExtraDependencyAttributes { ): Map[ModuleRevisionId, Map[String, String]] = { import scala.jdk.CollectionConverters.* (props.asScala get ExtraAttributesKey) match { - case None => Map.empty + case None => Map.empty case Some(str) => def processDep(m: ModuleRevisionId) = (simplify(m), filterCustomExtra(m, include = true)) (for { @@ -68,7 +68,7 @@ object PomExtraDependencyAttributes { */ def getDependencyExtra(m: Map[String, String]): Map[ModuleRevisionId, Map[String, String]] = (m get ExtraAttributesKey) match { - case None => Map.empty + case None => Map.empty case Some(str) => def processDep(m: ModuleRevisionId) = (simplify(m), filterCustomExtra(m, include = true)) readDependencyExtra(str).map(processDep).toMap diff --git a/lm-ivy/src/test/scala/sbt/internal/librarymanagement/CustomPomParserTest.scala b/lm-ivy/src/test/scala/sbt/internal/librarymanagement/CustomPomParserTest.scala index c25a196b6..08dcf5fb6 100644 --- a/lm-ivy/src/test/scala/sbt/internal/librarymanagement/CustomPomParserTest.scala +++ b/lm-ivy/src/test/scala/sbt/internal/librarymanagement/CustomPomParserTest.scala @@ -1,7 +1,7 @@ package sbt.internal.librarymanagement import java.io.File -import org.apache.ivy.core.module.descriptor.{ Artifact as IvyArtifact } +import org.apache.ivy.core.module.descriptor.Artifact as IvyArtifact import org.apache.ivy.core.module.id.ModuleRevisionId import org.apache.ivy.core.resolve.ResolveOptions import sbt.internal.librarymanagement.ivy.InlineIvyConfiguration diff --git a/lm-ivy/src/test/scala/sbt/internal/librarymanagement/SftpRepoSpec.scala b/lm-ivy/src/test/scala/sbt/internal/librarymanagement/SftpRepoSpec.scala index e69b4df3b..fe70925d0 100644 --- a/lm-ivy/src/test/scala/sbt/internal/librarymanagement/SftpRepoSpec.scala +++ b/lm-ivy/src/test/scala/sbt/internal/librarymanagement/SftpRepoSpec.scala @@ -32,7 +32,7 @@ object SftpRepoSpec extends BaseIvySpecification { // log.setLevel(Level.Debug) lmEngine().retrieve(module(org(repo)), scalaModuleInfo = None, currentTarget, log) match { case Right(v) => log.debug(v.toString()) - case Left(e) => + case Left(e) => log.log(Level.Error, e.failedPaths.toString()) throw e.resolveException } diff --git a/main-actions/src/main/scala/sbt/Pkg.scala b/main-actions/src/main/scala/sbt/Pkg.scala index 11d088ec0..3cd860268 100644 --- a/main-actions/src/main/scala/sbt/Pkg.scala +++ b/main-actions/src/main/scala/sbt/Pkg.scala @@ -165,7 +165,7 @@ object Pkg: for option <- conf.options do option match case PackageOption.JarManifest(mergeManifest) => mergeManifests(manifest, mergeManifest) - case PackageOption.MainClass(mainClassName) => + case PackageOption.MainClass(mainClassName) => main.put(Attributes.Name.MAIN_CLASS, mainClassName) case PackageOption.ManifestAttributes(attributes*) => main.asScala ++= attributes case PackageOption.FixedTimestamp(value) => () diff --git a/main-actions/src/main/scala/sbt/Sync.scala b/main-actions/src/main/scala/sbt/Sync.scala index 7ea32d08b..541f8d36f 100644 --- a/main-actions/src/main/scala/sbt/Sync.scala +++ b/main-actions/src/main/scala/sbt/Sync.scala @@ -200,8 +200,8 @@ object Sync { try { readUncaught[F](store)(using infoFormat) } catch { - case _: IOException => (Relation.empty[File, File], Map.empty[File, F]) - case _: ZipException => (Relation.empty[File, File], Map.empty[File, F]) + case _: IOException => (Relation.empty[File, File], Map.empty[File, F]) + case _: ZipException => (Relation.empty[File, File], Map.empty[File, F]) case e: TranslatedException => e.getCause match { case _: ZipException => (Relation.empty[File, File], Map.empty[File, F]) diff --git a/main-actions/src/main/scala/sbt/Tests.scala b/main-actions/src/main/scala/sbt/Tests.scala index 729107d20..40e448f35 100644 --- a/main-actions/src/main/scala/sbt/Tests.scala +++ b/main-actions/src/main/scala/sbt/Tests.scala @@ -260,7 +260,7 @@ object Tests { for (option <- config.options) { option match { - case Filter(include) => testFilters += include; () + case Filter(include) => testFilters += include; () case Filters(includes) => if (orderedFilters.nonEmpty) sys.error("Cannot define multiple ordered test filters.") else orderedFilters = includes @@ -500,7 +500,7 @@ object Tests { } else { def sequence(tasks: List[Task[Output]], acc: List[Output]): Task[List[Output]] = tasks match { - case Nil => task(acc.reverse) + case Nil => task(acc.reverse) case hd :: tl => hd flatMap { out => sequence(tl, out :: acc) diff --git a/main-actions/src/main/scala/sbt/internal/WorkerExchange.scala b/main-actions/src/main/scala/sbt/internal/WorkerExchange.scala index c17b949f6..7d89d6f9e 100644 --- a/main-actions/src/main/scala/sbt/internal/WorkerExchange.scala +++ b/main-actions/src/main/scala/sbt/internal/WorkerExchange.scala @@ -61,8 +61,7 @@ object WorkerExchange: ) ++ (socketOpt match case Some(s) => Seq("--tcp", s.getLocalPort().toString()) - case _ => Nil - ) + case _ => Nil) val onStdoutLine: String => Unit = connectionType match case WorkerConnection.Stdio => notifyListeners case _ => (line) => scala.Console.out.println(line) diff --git a/main-actions/src/main/scala/sbt/internal/sona/Sona.scala b/main-actions/src/main/scala/sbt/internal/sona/Sona.scala index 3ef4a80aa..074f8fdff 100644 --- a/main-actions/src/main/scala/sbt/internal/sona/Sona.scala +++ b/main-actions/src/main/scala/sbt/internal/sona/Sona.scala @@ -114,7 +114,7 @@ class SonaClient(reqTransform: Request => Request, uploadRequestTimeout: FiniteD waitForDeploy(deploymentId, deploymentName, publishingType, attempt + 1, log) case DeploymentState.PUBLISHED if publishingType == PublishingType.Automatic => () case DeploymentState.VALIDATED if publishingType == PublishingType.UserManaged => () - case DeploymentState.VALIDATED => + case DeploymentState.VALIDATED => Thread.sleep(sleepSec * 1000L) waitForDeploy(deploymentId, deploymentName, publishingType, attempt + 1, log) case _ => diff --git a/main-command/src/main/scala/sbt/BasicKeys.scala b/main-command/src/main/scala/sbt/BasicKeys.scala index d2a6972ea..bbb2a4029 100644 --- a/main-command/src/main/scala/sbt/BasicKeys.scala +++ b/main-command/src/main/scala/sbt/BasicKeys.scala @@ -10,7 +10,7 @@ package sbt import java.io.File import java.nio.file.Path -import sbt.internal.inc.classpath.{ ClassLoaderCache as IncClassLoaderCache } +import sbt.internal.inc.classpath.ClassLoaderCache as IncClassLoaderCache import sbt.internal.classpath.ClassLoaderCache import sbt.internal.server.ServerHandler import sbt.internal.util.AttributeKey diff --git a/main-command/src/main/scala/sbt/Command.scala b/main-command/src/main/scala/sbt/Command.scala index c7c3a75c1..e0606156c 100644 --- a/main-command/src/main/scala/sbt/Command.scala +++ b/main-command/src/main/scala/sbt/Command.scala @@ -12,7 +12,7 @@ import sbt.internal.inc.ReflectUtilities import sbt.internal.util.complete.{ DefaultParsers, EditDistance, Parser } import sbt.internal.util.Types.const import sbt.internal.util.{ AttributeKey, AttributeMap, Util } -import sbt.internal.util.Util.{ nilSeq } +import sbt.internal.util.Util.nilSeq /** * An operation that can be executed from the sbt console. @@ -185,7 +185,7 @@ object Command { def process(command: String, state: State, onParseError: String => Unit): State = { (if (command.contains(";")) parse(command, state.combinedParser) else parse(command, state.nonMultiParser)) match { - case Right(s) => s() // apply command. command side effects happen here + case Right(s) => s() // apply command. command side effects happen here case Left(errMsg) => state.log.error(errMsg) onParseError(errMsg) @@ -279,7 +279,7 @@ object Help { def message(h: Help, arg: Option[String]): String = arg match { case Some(x) => detail(x, h.detail) - case None => + case None => val brief = aligned(" ", " ", h.brief).mkString("\n", "\n", "\n") val more = h.more if (more.isEmpty) diff --git a/main-command/src/main/scala/sbt/CommandUtil.scala b/main-command/src/main/scala/sbt/CommandUtil.scala index e97db242f..c9a9ac7c6 100644 --- a/main-command/src/main/scala/sbt/CommandUtil.scala +++ b/main-command/src/main/scala/sbt/CommandUtil.scala @@ -60,7 +60,7 @@ object CommandUtil { def detail(selected: String, detailMap: Map[String, String]): String = detailMap.get(selected) match { case Some(exactDetail) => exactDetail - case None => + case None => try { val details = searchHelp(selected, detailMap) if (details.isEmpty) diff --git a/main-command/src/main/scala/sbt/ExceptionCategory.scala b/main-command/src/main/scala/sbt/ExceptionCategory.scala index b1d7e10fd..9fdf40eab 100644 --- a/main-command/src/main/scala/sbt/ExceptionCategory.scala +++ b/main-command/src/main/scala/sbt/ExceptionCategory.scala @@ -20,7 +20,7 @@ private[sbt] object ExceptionCategory { @tailrec def apply(t: Throwable): ExceptionCategory = t match { case _: AlreadyHandledException | _: UnprintableException => AlreadyHandled - case ite: InvocationTargetException => + case ite: InvocationTargetException => val cause = ite.getCause if (cause == null || cause == ite) new Full(ite) else apply(cause) case _: MessageOnlyException => new MessageOnly(t.toString) diff --git a/main-command/src/main/scala/sbt/Highlight.scala b/main-command/src/main/scala/sbt/Highlight.scala index c0f0064c5..f54d320bc 100644 --- a/main-command/src/main/scala/sbt/Highlight.scala +++ b/main-command/src/main/scala/sbt/Highlight.scala @@ -11,7 +11,7 @@ package sbt import java.util.regex.Pattern import scala.Console.{ BOLD, RESET } -import sbt.internal.util.{ Terminal as UTerminal } +import sbt.internal.util.Terminal as UTerminal object Highlight { diff --git a/main-command/src/main/scala/sbt/State.scala b/main-command/src/main/scala/sbt/State.scala index 74543b8d5..b1afeb374 100644 --- a/main-command/src/main/scala/sbt/State.scala +++ b/main-command/src/main/scala/sbt/State.scala @@ -13,7 +13,7 @@ import java.net.{ URL, URLClassLoader } import java.util.concurrent.Callable import sbt.internal.classpath.ClassLoaderCache -import sbt.internal.inc.classpath.{ ClassLoaderCache as IncClassLoaderCache } +import sbt.internal.inc.classpath.ClassLoaderCache as IncClassLoaderCache import sbt.internal.util.complete.{ HistoryCommands, Parser } import sbt.internal.util.* import sbt.util.Logger @@ -270,7 +270,7 @@ object State { f(cmd, s1) } s.remainingCommands match { - case Nil => exit(true) + case Nil => exit(true) case x :: xs => (x.execId, x.source) match { /* @@ -394,14 +394,14 @@ object State { s.get(BasicKeys.extendedClassLoaderCache).foreach(_.close()) val cache = newClassLoaderCache s.configuration.provider.scalaProvider.loader match { - case null => // This can happen in scripted + case null => // This can happen in scripted case fullScalaLoader => val jars = s.configuration.provider.scalaProvider.jars val (library, rest) = jars.partition(_.getName == "scala-library.jar") library.toList match { case l @ lj :: Nil => fullScalaLoader.getParent match { - case null => // This can happen for old launchers. + case null => // This can happen for old launchers. case libraryLoader => cache.cachedCustomClassloader(l, () => new UncloseableURLLoader(l, libraryLoader)) fullScalaLoader match { diff --git a/main-command/src/main/scala/sbt/Watched.scala b/main-command/src/main/scala/sbt/Watched.scala index ea28c592e..ace09e71e 100644 --- a/main-command/src/main/scala/sbt/Watched.scala +++ b/main-command/src/main/scala/sbt/Watched.scala @@ -12,7 +12,7 @@ import java.io.File import java.nio.file.FileSystems import sbt.internal.LabeledFunctions.* -import sbt.internal.io.{ Source } +import sbt.internal.io.Source import sbt.io.* import scala.concurrent.duration.* @@ -64,7 +64,7 @@ object Watched: FileSystems.getDefault.newWatchService() case Some("closewatch") => closeWatch case _ if Properties.isMac => closeWatch - case _ => + case _ => FileSystems.getDefault.newWatchService() } } diff --git a/main-command/src/main/scala/sbt/internal/CommandChannel.scala b/main-command/src/main/scala/sbt/internal/CommandChannel.scala index 0de3f0a93..c5dcbaad0 100644 --- a/main-command/src/main/scala/sbt/internal/CommandChannel.scala +++ b/main-command/src/main/scala/sbt/internal/CommandChannel.scala @@ -91,7 +91,7 @@ abstract class CommandChannel { case "debug" => setLevel(Level.Debug, "debug") case "info" => setLevel(Level.Info, "info") case "warn" => setLevel(Level.Warn, "warn") - case cmd => + case cmd => if (cmd.nonEmpty) appendExec(cmd, None) else false } diff --git a/main-command/src/main/scala/sbt/internal/classpath/ClassLoaderCache.scala b/main-command/src/main/scala/sbt/internal/classpath/ClassLoaderCache.scala index c74e59205..c77913911 100644 --- a/main-command/src/main/scala/sbt/internal/classpath/ClassLoaderCache.scala +++ b/main-command/src/main/scala/sbt/internal/classpath/ClassLoaderCache.scala @@ -200,7 +200,7 @@ private[sbt] class ClassLoaderCache( private def get(key: Key, f: () => ClassLoader): ClassLoader = { scalaProviderKey match { case Some(k) if k == key => k.toClassLoader - case _ => + case _ => def addLoader(): ClassLoader = { val ref = mkReference(key, f()) val loader = ref.get @@ -211,7 +211,7 @@ private[sbt] class ClassLoaderCache( lock.synchronized { delegate.get(key) match { case null => addLoader() - case ref => + case ref => ref.get match { case null => addLoader() case l => l @@ -223,7 +223,7 @@ private[sbt] class ClassLoaderCache( private def clear(lock: Object): Unit = { delegate.asScala.foreach { case (_, ClassLoaderReference(_, classLoader)) => close(classLoader) - case (_, r: Reference[ClassLoader]) => + case (_, r: Reference[ClassLoader]) => r.get match { case null => case classLoader => close(classLoader) diff --git a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala index 694dd5c80..cb41974fc 100644 --- a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala +++ b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala @@ -203,7 +203,7 @@ class NetworkClient( else { startInputThread() stdinBytes.poll(5, TimeUnit.SECONDS) match { - case null => System.exit(0) + case null => System.exit(0) case i if i == 9 => errorStream.println("\nStarting server...") waitForServer(portfile, !promptCompleteUsers, startServer = true) @@ -299,7 +299,7 @@ class NetworkClient( Option(inputThread.get).foreach(_.close()) Option(interactiveThread.get).foreach(_.interrupt) } - case `readSystemIn` => startInputThread() + case `readSystemIn` => startInputThread() case `cancelReadSystemIn` => inputThread.get match { case null => @@ -458,14 +458,14 @@ class NetworkClient( try { s.getInputStream.read match { case -1 | 0 => readThreadAlive.set(false) - case 2 => // STX: start of text + case 2 => // STX: start of text gotInputBack = true case 5 => // ENQ: enquiry term.enterRawMode(); startInputThread() case 3 if gotInputBack => // ETX: end of text readThreadAlive.set(false) case i if gotInputBack => stdinBytes.offer(i) - case 10 => // CR + case 10 => // CR buffer.append(10.toByte) printStream.write(buffer.toArray[Byte]) buffer.clear() @@ -609,7 +609,7 @@ class NetworkClient( } def completeExec(execId: String, exitCode: Int) = { pendingResults.remove(execId) match { - case null => () + case null => () case (q, startTime, name) => val now = System.currentTimeMillis val message = NetworkClient.elapsedString(startTime, now) @@ -634,7 +634,7 @@ class NetworkClient( private val onCompletionResponse: PartialFunction[JsonRpcResponseMessage, Unit] = { case msg if pendingCompletions.containsKey(msg.id) => pendingCompletions.remove(msg.id) match { - case null => () + case null => () case completions => completions(msg.result match { case Some(o: JObject) => @@ -729,7 +729,7 @@ class NetworkClient( } case (`Shutdown`, Some(_)) => Vector.empty case (msg, _) if msg.startsWith("build/") => Vector.empty - case ("sbt/exec", Some(json)) => + case ("sbt/exec", Some(json)) => import sbt.protocol.codec.JsonProtocol.given Converter.fromJson[ExecStatusEvent](json) match { case Success(event) if event.status == "Queued" => @@ -795,7 +795,7 @@ class NetworkClient( private def clientSideRun(runInfo: RunInfo): Try[Unit] = { runInfo.windowTitle.foreach(setWindowTitle) def nativeRun(info: NativeRunInfo): Try[Unit] = { - import java.lang.{ ProcessBuilder as JProcessBuilder } + import java.lang.ProcessBuilder as JProcessBuilder val option = ForkOptions( javaHome = None, outputStrategy = None, // TODO: Handle buffered output etc @@ -982,7 +982,7 @@ class NetworkClient( val (rawPrefix, prefix, rawSuffix, suffix) = if (quoteCount > 0) { query.lastIndexOf('"') match { case -1 => (query, query, None, None) // shouldn't happen - case i => + case i => val rawPrefix = query.substring(0, i) val prefix = rawPrefix.replace("\"", "").replace("\\;", ";") val rawSuffix = query.substring(i).replace("\\;", ";") @@ -1079,7 +1079,7 @@ class NetworkClient( } } catch { case e: SocketException if command.toString.contains("exit") => running.set(false) - case e: IOException => + case e: IOException => errorStream.println(s"Caught exception writing command to server: $e") running.set(false) } @@ -1117,7 +1117,7 @@ class NetworkClient( if (mainThread != null && mainThread != Thread.currentThread) mainThread.interrupt connectionHolder.get match { case null => - case c => + case c => try sendExecCommand("exit") finally c.shutdown() } @@ -1317,7 +1317,7 @@ object NetworkClient { case "--sbt-launch-jar" if i + 1 < sanitized.length => i += 1 launchJar = Option(sanitized(i).replace("%20", " ")) - case "-bsp" | "--bsp" | "bsp" => bsp = true + case "-bsp" | "--bsp" | "bsp" => bsp = true case "-no-server" | "--no-server" => System.setProperty("sbt.server.autostart", "false") case a if a.startsWith("--autostart=") => @@ -1330,7 +1330,7 @@ object NetworkClient { case a if launcherEqPrefixes.exists(p => a.startsWith(p)) => () case a if a.startsWith("-J") => () case a if !a.startsWith("-") => commandArgs += a - case a @ SysProp(key, value) => + case a @ SysProp(key, value) => System.setProperty(key, value) sbtArguments += a case a => sbtArguments += a diff --git a/main-command/src/main/scala/sbt/internal/server/Server.scala b/main-command/src/main/scala/sbt/internal/server/Server.scala index cc62317d9..de0ebd4c4 100644 --- a/main-command/src/main/scala/sbt/internal/server/Server.scala +++ b/main-command/src/main/scala/sbt/internal/server/Server.scala @@ -90,7 +90,7 @@ private[sbt] object Server { addServerError(new ServerSocket(port, 50, InetAddress.getByName(host))) } } match { - case Failure(e) => p.failure(e) + case Failure(e) => p.failure(e) case Success(serverSocket) => serverSocket.setSoTimeout(5000) serverSocketHolder.getAndSet(serverSocket) match { @@ -132,7 +132,7 @@ private[sbt] object Server { def tryClient(f: => Socket): Unit = { if (portfile.exists) { Try { f } match { - case Failure(_) => () + case Failure(_) => () case Success(socket) => socket.close() throw new AlreadyRunningException() diff --git a/main-command/src/main/scala/sbt/internal/server/ServerHandler.scala b/main-command/src/main/scala/sbt/internal/server/ServerHandler.scala index 5356b710d..3acb8a48b 100644 --- a/main-command/src/main/scala/sbt/internal/server/ServerHandler.scala +++ b/main-command/src/main/scala/sbt/internal/server/ServerHandler.scala @@ -14,7 +14,7 @@ import sjsonnew.JsonFormat import sbt.internal.protocol.* import sbt.util.Logger import sbt.protocol.{ CompletionParams as CP, SettingQuery as Q } -import sbt.internal.langserver.{ CancelRequestParams as CRP } +import sbt.internal.langserver.CancelRequestParams as CRP /** * ServerHandler allows plugins to extend sbt server. diff --git a/main-command/src/main/scala/sbt/internal/ui/UITask.scala b/main-command/src/main/scala/sbt/internal/ui/UITask.scala index f5030b8aa..6789e8fa0 100644 --- a/main-command/src/main/scala/sbt/internal/ui/UITask.scala +++ b/main-command/src/main/scala/sbt/internal/ui/UITask.scala @@ -19,7 +19,7 @@ import sbt.internal.CommandChannel import sbt.internal.util.ConsoleAppender.{ ClearPromptLine, ClearScreenAfterCursor, DeleteLine } import sbt.internal.util.Terminal.hasConsole import sbt.internal.util.* -import sbt.internal.util.complete.{ Parser } +import sbt.internal.util.complete.Parser import scala.annotation.tailrec @@ -109,7 +109,7 @@ private[sbt] object UITask { case Some(NoShellPrompt) | None => s.get(colorShellPrompt) match { case Some(pf) => pf(terminal.isColorEnabled, s) - case None => + case None => def color(s: String): String = if (terminal.isColorEnabled) s"$s" else "" s"${color(DeleteLine)}> ${color(ClearScreenAfterCursor)}" } diff --git a/main-command/src/main/scala/sbt/internal/ui/UserThread.scala b/main-command/src/main/scala/sbt/internal/ui/UserThread.scala index c4d4cb91f..4d83485cb 100644 --- a/main-command/src/main/scala/sbt/internal/ui/UserThread.scala +++ b/main-command/src/main/scala/sbt/internal/ui/UserThread.scala @@ -45,7 +45,7 @@ private[sbt] class UserThread(val channel: CommandChannel) extends AutoCloseable } } uiThread.getAndSet((task, thread)) match { - case null => thread.start() + case null => thread.start() case (prevTask, prevThread) if prevTask.getClass != task.getClass => prevTask.close() prevThread.joinFor(1.second) @@ -56,7 +56,7 @@ private[sbt] class UserThread(val channel: CommandChannel) extends AutoCloseable uiThread.get match { case null => submit() case (prevTask, _) if prevTask.getClass == task.getClass => - case (t, thread) => + case (t, thread) => stopThreadImpl() submit() } @@ -66,7 +66,7 @@ private[sbt] class UserThread(val channel: CommandChannel) extends AutoCloseable private[sbt] def stopThreadImpl(): Unit = uiThread.synchronized { uiThread.getAndSet(null) match { - case null => + case null => case (t, thread) => t.close() thread.joinFor(1.second) diff --git a/main-command/src/main/scala/sbt/internal/util/ReadJsonFromInputStream.scala b/main-command/src/main/scala/sbt/internal/util/ReadJsonFromInputStream.scala index b03a97d03..0928ca8fa 100644 --- a/main-command/src/main/scala/sbt/internal/util/ReadJsonFromInputStream.scala +++ b/main-command/src/main/scala/sbt/internal/util/ReadJsonFromInputStream.scala @@ -63,7 +63,7 @@ private[sbt] object ReadJsonFromInputStream { consecutiveLineEndings += 1 case `carriageReturn` => onCarriageReturn = true case -1 => running.set(false) - case c => + case c => if (c == newline) getLine() else { if (index >= headerBuffer.length) expandHeaderBuffer() @@ -94,7 +94,7 @@ private[sbt] object ReadJsonFromInputStream { running.set(false) throw new ClosedChannelException case `carriageReturn` => onCarriageReturn = true - case c => + case c => onCarriageReturn = false if (index >= headerBuffer.length) expandHeaderBuffer() headerBuffer(index) = c.toByte diff --git a/main-settings/src/main/scala/sbt/Def.scala b/main-settings/src/main/scala/sbt/Def.scala index f510ecb86..726a4eda8 100644 --- a/main-settings/src/main/scala/sbt/Def.scala +++ b/main-settings/src/main/scala/sbt/Def.scala @@ -172,7 +172,7 @@ object Def extends BuildSyntax with Init with InitializeImplicits: project: Reference, trailingSlash: Boolean ): String = { - import Reference.{ display as displayRef } + import Reference.display as displayRef @tailrec def loop(ref: Reference): String = ref match { case ProjectRef(b, p) => if (b == current.build) loop(LocalProject(p)) else displayRef(ref) case BuildRef(b) => if (b == current.build) loop(ThisBuild) else displayRef(ref) @@ -256,10 +256,9 @@ object Def extends BuildSyntax with Init with InitializeImplicits: def toIParser[A1](p: Initialize[InputTask[A1]]): Initialize[State => Parser[Task[A1]]] = p(_.parser) - import std.SettingMacro.{ - // settingDynMacroImpl, - settingMacroImpl - } + import std.SettingMacro. + // settingDynMacroImpl, + settingMacroImpl import std.* import language.experimental.macros @@ -442,7 +441,7 @@ object Def extends BuildSyntax with Init with InitializeImplicits: Def.stateKey.zipWith(in)((sTask, it) => sTask map { s => Parser.parse(arg, it.parser(s)) match - case Right(a) => Def.value[Task[A1]](a) + case Right(a) => Def.value[Task[A1]](a) case Left(msg) => val indented = msg.linesIterator.map(" " + _).mkString("\n") sys.error(s"Invalid programmatic input:\n$indented") diff --git a/main-settings/src/main/scala/sbt/InputTask.scala b/main-settings/src/main/scala/sbt/InputTask.scala index 48397582a..b766da3da 100644 --- a/main-settings/src/main/scala/sbt/InputTask.scala +++ b/main-settings/src/main/scala/sbt/InputTask.scala @@ -26,7 +26,7 @@ final class InputTask[A1] private (val parser: State => Parser[Task[A1]]): def fullInput(in: String): InputTask[A1] = InputTask[A1](s => Parser.parse(in, parser(s)) match { - case Right(v) => Parser.success(v) + case Right(v) => Parser.success(v) case Left(msg) => val indented = msg.linesIterator.map(" " + _).mkString("\n") Parser.failure(s"Invalid programmatic input:\n$indented") diff --git a/main-settings/src/main/scala/sbt/Plugins.scala b/main-settings/src/main/scala/sbt/Plugins.scala index f9357cc60..d3700f6cc 100644 --- a/main-settings/src/main/scala/sbt/Plugins.scala +++ b/main-settings/src/main/scala/sbt/Plugins.scala @@ -215,7 +215,7 @@ object Plugins extends PluginsFunctions { clauses, (flattenConvert(requestedPlugins) ++ convertAll(alwaysEnabled)).toSet ) match { - case Left(problem) => throw AutoPluginException(problem) + case Left(problem) => throw AutoPluginException(problem) case Right(results) => log.debug(s" :: deduced result: ${results}") val selectedAtoms: List[Atom] = results.ordered @@ -346,7 +346,7 @@ ${listConflicts(conflicting)}""") private[sbt] def overrideWith(current: Plugins, update: Plugins): Plugins = { val opposite: Set[Basic] = flatten(update).map { - case Exclude(p) => p: Basic + case Exclude(p) => p: Basic case p: AutoPlugin => Exclude(p): Basic }.toSet @@ -356,7 +356,7 @@ ${listConflicts(conflicting)}""") private[sbt] def remove(a: Plugins, del: Set[Basic]): Plugins = a match { case b: Basic => if (del(b)) Empty else b case Empty => Empty - case And(ns) => + case And(ns) => val removed = ns.filterNot(del) if (removed.isEmpty) Empty else And(removed) } diff --git a/main-settings/src/main/scala/sbt/PromiseWrap.scala b/main-settings/src/main/scala/sbt/PromiseWrap.scala index a7fb2cc6f..8fa3d6aa3 100644 --- a/main-settings/src/main/scala/sbt/PromiseWrap.scala +++ b/main-settings/src/main/scala/sbt/PromiseWrap.scala @@ -8,7 +8,7 @@ package sbt -import scala.concurrent.{ Promise as XPromise } +import scala.concurrent.Promise as XPromise final class PromiseWrap[A]: private[sbt] val underlying: XPromise[A] = XPromise() diff --git a/main-settings/src/main/scala/sbt/Scope.scala b/main-settings/src/main/scala/sbt/Scope.scala index c6db9923d..5596f7d87 100644 --- a/main-settings/src/main/scala/sbt/Scope.scala +++ b/main-settings/src/main/scala/sbt/Scope.scala @@ -370,13 +370,13 @@ object Scope: } scope.project match { - case Zero | This => globalProjectDelegates(scope) + case Zero | This => globalProjectDelegates(scope) case Select(proj) => val resolvedProj = resolve(proj) val projAxes: Seq[ScopeAxis[ResolvedReference]] = resolvedProj match { case pr: ProjectRef => index.project(pr) - case br: BuildRef => + case br: BuildRef => List(Select(br): ScopeAxis[ResolvedReference], Zero: ScopeAxis[ResolvedReference]) } expandDelegateScopes(resolvedProj)(projAxes) diff --git a/main-settings/src/main/scala/sbt/std/InputTaskMacro.scala b/main-settings/src/main/scala/sbt/std/InputTaskMacro.scala index 31dc687f8..b5861ec3a 100644 --- a/main-settings/src/main/scala/sbt/std/InputTaskMacro.scala +++ b/main-settings/src/main/scala/sbt/std/InputTaskMacro.scala @@ -140,7 +140,7 @@ object InputTaskMacro: .transform { (replacement: Term) => inputBuf.append((name, TypeRepr.of[a](using tpe), qual, replacement)) oldTree - } + } def genCreateFree(body: Term) = val init = expandTask[A1](true, body) '{ @@ -177,7 +177,7 @@ object InputTaskMacro: } val body = convert1.transformWrappers(expr.asTerm, record, Symbol.spliceOwner) inputBuf.toList match - case Nil => genCreateFree(body) + case Nil => genCreateFree(body) case (_, tpe, _, paramTree) :: Nil => tpe.asType match case '[a] => genCreateDyn[a](paramTree, body) diff --git a/main-settings/src/main/scala/sbt/std/SettingMacro.scala b/main-settings/src/main/scala/sbt/std/SettingMacro.scala index 8577e495f..557b99588 100644 --- a/main-settings/src/main/scala/sbt/std/SettingMacro.scala +++ b/main-settings/src/main/scala/sbt/std/SettingMacro.scala @@ -28,7 +28,7 @@ class InitializeConvert[C <: Quotes & scala.Singleton](override val qctx: C, val override def convert[A: Type](nme: String, in: Term): Converted = nme match - case InputWrapper.WrapInitName => Converted.success(in) + case InputWrapper.WrapInitName => Converted.success(in) case InputWrapper.WrapTaskName | InputWrapper.WrapInitTaskName => Converted.Failure(in.pos, "A setting cannot depend on a task") case InputWrapper.WrapPreviousName => diff --git a/main-settings/src/main/scala/sbt/std/TaskMacro.scala b/main-settings/src/main/scala/sbt/std/TaskMacro.scala index be91e3cfe..35dbe8094 100644 --- a/main-settings/src/main/scala/sbt/std/TaskMacro.scala +++ b/main-settings/src/main/scala/sbt/std/TaskMacro.scala @@ -65,7 +65,7 @@ object TaskMacro: val cached = ContextUtil.isTaskCacheByDefault && !isUncacheApplied && cl.nonEmpty t match case '{ if ($cond) then $thenp else $elsep } => taskIfImpl[A1](t, cached) - case _ => + case _ => val convert1 = new FullConvert(qctx, 0) if cached then convert1.contMapN[A1, F, Id]( @@ -84,7 +84,7 @@ object TaskMacro: ): Expr[Initialize[Task[A1]]] = t match case '{ if ($cond) then $thenp else $elsep } => taskIfImpl[A1](t, cached) - case _ => + case _ => val convert1 = new FullConvert(qctx, 0) if cached then convert1.contMapN[A1, F, Id]( diff --git a/main-settings/src/test/scala/sbt/std/UsageTest.scala b/main-settings/src/test/scala/sbt/std/UsageTest.scala index bdaf40a87..5a85a4374 100644 --- a/main-settings/src/test/scala/sbt/std/UsageTest.scala +++ b/main-settings/src/test/scala/sbt/std/UsageTest.scala @@ -89,8 +89,7 @@ object Assign { val dyn: Def.Initialize[Task[Int]] = Def.taskDyn { val a = ak.value - if a < 1 then Def.task { 1 } - else Def.task { 0 } + if a < 1 then Def.task { 1 } else Def.task { 0 } } import DefaultParsers.* diff --git a/main/src/main/scala/sbt/Cross.scala b/main/src/main/scala/sbt/Cross.scala index 3bc838184..b40b96f2a 100644 --- a/main/src/main/scala/sbt/Cross.scala +++ b/main/src/main/scala/sbt/Cross.scala @@ -51,7 +51,7 @@ object Cross { versionArg.split("=", 2) match { case Array(home) if new File(home).exists() => ScalaHomeVersion(new File(home), None, force) - case Array(v) => NamedScalaVersion(v, force) + case Array(v) => NamedScalaVersion(v, force) case Array(v, home) => ScalaHomeVersion(new File(home), Some(v).filterNot(_.isEmpty), force) } @@ -211,8 +211,8 @@ object Cross { .sortBy(_._1) commandsByVersion.flatMap { (v, commands) => commands match { - case Seq(c) => Seq(s"$SwitchCommand $verbose $v $c") - case Seq() => Nil // should be unreachable + case Seq(c) => Seq(s"$SwitchCommand $verbose $v $c") + case Seq() => Nil // should be unreachable case multi if fullArgs.isEmpty => Seq(s"$SwitchCommand $verbose $v all ${multi.mkString(" ")}") case multi => Seq(s"$SwitchCommand $verbose $v") ++ multi @@ -348,7 +348,7 @@ object Cross { scalaVersions.filter(v => selector.matches(VersionNumber(v))) match { case Nil => (project, None, scalaVersions) case Seq(version) => (project, Some(version), scalaVersions) - case multiple => + case multiple => sys.error( s"Multiple crossScalaVersions matched query '$version': ${multiple.mkString(", ")}" ) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 1273a3337..14ea44658 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -13,7 +13,7 @@ import java.nio.file.{ Files, Path as NioPath } import java.util.{ Optional, UUID } import java.util.concurrent.TimeUnit import lmcoursier.CoursierDependencyResolution -import lmcoursier.definitions.{ Configuration as CConfiguration } +import lmcoursier.definitions.Configuration as CConfiguration import org.apache.ivy.core.module.descriptor.ModuleDescriptor import org.apache.ivy.core.module.id.ModuleRevisionId import org.scalasbt.ipcsocket.Win32SecurityLevel @@ -1963,7 +1963,7 @@ object Defaults extends BuildCommon { try ITerminal.get.inputStream.read match { case -1 | -2 => None - case b => + case b => val res = b.toChar.toString println(res) Some(res) @@ -3139,7 +3139,7 @@ object Classpaths { ) match { case (Some(delegated), Seq(), _) => delegated case (_, rs, Some(ars)) => ars ++ rs - case (_, rs, _) => + case (_, rs, _) => Resolver.combineDefaultResolvers(rs.toVector, mavenCentral = true) } ), @@ -3170,7 +3170,7 @@ object Classpaths { else Vector.empty bootResolvers.value match { case Some(repos) if overrideBuildResolvers.value => proj +: repos - case _ => + case _ => val base = if (sbtPlugin.value) sbtResolvers.value ++ rs ++ pr else rs ++ pr (proj +: base).distinct } @@ -3935,7 +3935,7 @@ object Classpaths { val currentBuildClock = DependencyLockFile.computeBuildClock(deps, resolverNames) DependencyLockManager.validate(lockFile, currentBuildClock, log) match case Some(_) => () - case None => + case None => throw new MessageOnlyException( s"Dependency lock file is stale: ${lockFile.getAbsolutePath}. Run 'dependencyLock' to update it." ) @@ -4055,7 +4055,7 @@ object Classpaths { val isRoot = er.contains(rs) val shouldForce = isRoot || { fup match - case None => false + case None => false case Some(period) => val fullUpdateOutput = cacheDirectory / "output" val now = System.currentTimeMillis @@ -4711,7 +4711,7 @@ object Classpaths { case Predefined.ScalaToolsSnapshots => Resolver.ScalaToolsSnapshots case Predefined.SonatypeOSSReleases => Resolver.sonatypeRepo("releases") case Predefined.SonatypeOSSSnapshots => Resolver.sonatypeRepo("snapshots") - case unknown => + case unknown => sys.error( "Unknown predefined resolver '" + unknown + "'. This resolver may only be supported in newer sbt versions." ) diff --git a/main/src/main/scala/sbt/Keys.scala b/main/src/main/scala/sbt/Keys.scala index e6fa4de25..410dbe961 100644 --- a/main/src/main/scala/sbt/Keys.scala +++ b/main/src/main/scala/sbt/Keys.scala @@ -8,7 +8,7 @@ package sbt -import java.nio.file.{ Path as NioPath } +import java.nio.file.Path as NioPath import java.io.File import java.net.URI import lmcoursier.definitions.{ CacheLogger, ModuleMatchers, Reconciliation } diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala index fea308de3..017fecc07 100644 --- a/main/src/main/scala/sbt/Main.scala +++ b/main/src/main/scala/sbt/Main.scala @@ -772,7 +772,7 @@ object BuiltinCommands { def last: Command = Command(LastCommand, lastBrief, lastDetailed)(aggregatedKeyValueParser) { case (s, Some(sks)) => lastImpl(s, sks, None) - case (s, None) => + case (s, None) => for (logFile <- lastLogFile(s)) yield Output.last(logFile, printLast) keepLastLog(s) } @@ -1258,7 +1258,9 @@ object BuiltinCommands { if (!suppress) { Banner(version).foreach(banner => state.log.info(banner)) } - } catch { case _: IOException => /* Don't let errors in this command prevent startup */ } + } catch { + case _: IOException => /* Don't let errors in this command prevent startup */ + } state.put(bannerHasBeenShown, true) } else state } diff --git a/main/src/main/scala/sbt/MainLoop.scala b/main/src/main/scala/sbt/MainLoop.scala index f2ebab9ba..2767d0c95 100644 --- a/main/src/main/scala/sbt/MainLoop.scala +++ b/main/src/main/scala/sbt/MainLoop.scala @@ -223,7 +223,7 @@ private[sbt] object MainLoop: def getOrSet[T](state: State, key: AttributeKey[T], value: Extracted => T): State = { state.get(key) match { case Some(_) => state - case _ => + case _ => if (state.get(Keys.stateBuildStructure).isDefined) { val extracted = Project.extract(state) state.put(key, value(extracted)) @@ -364,12 +364,12 @@ private[sbt] object MainLoop: case State.Continue => ExitCode.Success case State.ClearGlobalLog => ExitCode.Success case State.KeepLastLog => ExitCode.Success - case ret: State.Return => + case ret: State.Return => ret.result match case exit: xsbti.Exit => ExitCode(exit.code().toLong) case _: xsbti.Continue => ExitCode.Success case _: xsbti.Reboot => ExitCode.Success - case x => + case x => val clazz = if (x eq null) "" else " (class: " + x.getClass + ")" state.log.debug(s"Unknown main result: $x$clazz") ExitCode.Unknown diff --git a/main/src/main/scala/sbt/ProjectExtra.scala b/main/src/main/scala/sbt/ProjectExtra.scala index 479a6909b..4985203b4 100755 --- a/main/src/main/scala/sbt/ProjectExtra.scala +++ b/main/src/main/scala/sbt/ProjectExtra.scala @@ -8,7 +8,7 @@ package sbt import java.io.File -import java.nio.file.{ Path as NioPath } +import java.nio.file.Path as NioPath import java.net.URI // import Project._ import Keys.{ @@ -638,7 +638,8 @@ trait ProjectExtra extends Scoped.Syntax: case LoadAction.Current => val base = s.configuration.baseDirectory projectReturn(s) match - case Nil => (setProjectReturn(s, base :: Nil), base); case x :: _ => (s, x) + case Nil => (setProjectReturn(s, base :: Nil), base); + case x :: _ => (s, x) case LoadAction.Plugins => val (newBase, oldStack) = diff --git a/main/src/main/scala/sbt/SessionVar.scala b/main/src/main/scala/sbt/SessionVar.scala index 8c13c8840..40e76cb8b 100644 --- a/main/src/main/scala/sbt/SessionVar.scala +++ b/main/src/main/scala/sbt/SessionVar.scala @@ -80,7 +80,7 @@ object SessionVar { ): (State, Option[T]) = get(key, state) match { case s: Some[T] => (state, s) - case None => + case None => read(key, state)(using f) match { case s @ Some(t) => val newState = diff --git a/main/src/main/scala/sbt/TemplateCommandUtil.scala b/main/src/main/scala/sbt/TemplateCommandUtil.scala index 0e8c39513..90c38aba2 100644 --- a/main/src/main/scala/sbt/TemplateCommandUtil.scala +++ b/main/src/main/scala/sbt/TemplateCommandUtil.scala @@ -58,7 +58,7 @@ private[sbt] object TemplateCommandUtil { terminate } else { fortifyArgs(templateDescriptions.toList) match { - case Nil => terminate + case Nil => terminate case arg :: Nil if arg.endsWith(".local") => extracted.runInputTask(Keys.templateRunLocal, " " + arg, s0) reload @@ -87,7 +87,7 @@ private[sbt] object TemplateCommandUtil { hit } match { case Some(_) => // do nothing - case None => + case None => val error = "Template not found for: " + arguments.mkString(" ") throw new IllegalArgumentException(error) } @@ -224,8 +224,8 @@ private[sbt] object TemplateCommandUtil { ans } ans0 match { - case '\r' | '\n' => printThenReturn(focusValue) - case 'q' | 'Q' | -1 => printThenReturn("") + case '\r' | '\n' => printThenReturn(focusValue) + case 'q' | 'Q' | -1 => printThenReturn("") case 'j' | 'J' | ITerminal.VK_DOWN => clearMenu(mappingList) askTemplate(mappingList, math.min(focus + 1, mappingList.size - 1)) @@ -281,7 +281,7 @@ private[sbt] object TemplateCommandUtil { case ScalaToolkitSlug :: Nil => scalaToolkitTemplate() case TypelevelToolkitSlug :: Nil => typelevelToolkitTemplate() case SbtCrossPlatformSlug :: Nil => sbtCrossPlatformTemplate() - case _ => + case _ => val error = "Local template not found for: " + arguments.mkString(" ") throw new IllegalArgumentException(error) } diff --git a/main/src/main/scala/sbt/coursierint/CoursierInputsTasks.scala b/main/src/main/scala/sbt/coursierint/CoursierInputsTasks.scala index 7af0d36ee..222082aa5 100644 --- a/main/src/main/scala/sbt/coursierint/CoursierInputsTasks.scala +++ b/main/src/main/scala/sbt/coursierint/CoursierInputsTasks.scala @@ -229,7 +229,7 @@ object CoursierInputsTasks { val creds = sbt.Keys.allCredentials.value .flatMap { case dc: IvyCredentials.DirectCredentials => List(dc) - case fc: IvyCredentials.FileCredentials => + case fc: IvyCredentials.FileCredentials => sbt.internal.librarymanagement.ivy.IvyCredentials.loadCredentials(fc.path) match { case Left(err) => log.warn(s"$err, ignoring it") diff --git a/main/src/main/scala/sbt/coursierint/LMCoursier.scala b/main/src/main/scala/sbt/coursierint/LMCoursier.scala index 685481bf8..7a588e914 100644 --- a/main/src/main/scala/sbt/coursierint/LMCoursier.scala +++ b/main/src/main/scala/sbt/coursierint/LMCoursier.scala @@ -24,7 +24,7 @@ import lmcoursier.* import lmcoursier.syntax.* import lmcoursier.credentials.Credentials import Keys.* -import sbt.librarymanagement.{ Credentials as IvyCredentials } +import sbt.librarymanagement.Credentials as IvyCredentials import sbt.internal.util.Util import sbt.librarymanagement.* import sbt.util.Logger @@ -60,7 +60,7 @@ object LMCoursier { .orElse(sys.env.get("COURSIER_CACHE").map(absoluteFile)) .orElse(sys.props.get("coursier.cache").map(absoluteFile)) match { case Some(dir) => dir - case _ => + case _ => if Util.isWindows then windowsCacheDirectory else CoursierDependencyResolution.defaultCacheLocation } @@ -281,7 +281,7 @@ object LMCoursier { sbt.internal.librarymanagement.ivy.IvyCredentials.loadCredentials(fc.path) }) match { case Left(err) => st.log.warn(err) - case Right(d) => + case Right(d) => credentialRegistry.put((d.host, d.realm), d) () } diff --git a/main/src/main/scala/sbt/internal/APIMappings.scala b/main/src/main/scala/sbt/internal/APIMappings.scala index 5e4bdec43..d6820f495 100644 --- a/main/src/main/scala/sbt/internal/APIMappings.scala +++ b/main/src/main/scala/sbt/internal/APIMappings.scala @@ -30,7 +30,7 @@ private[sbt] object APIMappings { ): Option[(HashedVirtualFileRef, URI)] = entry.get(Keys.entryApiURL) match case Some(u) => Some((entry.data, URI(u))) - case None => + case None => entry.get(Keys.moduleIDStr).flatMap { str => val mid = Classpaths.moduleIdJsonKeyFormat.read(str) extractFromID(entry.data, mid, log) diff --git a/main/src/main/scala/sbt/internal/AbstractTaskExecuteProgress.scala b/main/src/main/scala/sbt/internal/AbstractTaskExecuteProgress.scala index 284c9f273..20aaaee58 100644 --- a/main/src/main/scala/sbt/internal/AbstractTaskExecuteProgress.scala +++ b/main/src/main/scala/sbt/internal/AbstractTaskExecuteProgress.scala @@ -53,7 +53,7 @@ private[sbt] abstract class AbstractTaskExecuteProgress( val now = System.nanoTime tasks.forEach { t => timings.get(t) match { - case null => + case null => case timing => if (timing.isActive) { val elapsed = (now - timing.startNanos) / 1000 diff --git a/main/src/main/scala/sbt/internal/Act.scala b/main/src/main/scala/sbt/internal/Act.scala index 7d55433bc..65c49a487 100644 --- a/main/src/main/scala/sbt/internal/Act.scala +++ b/main/src/main/scala/sbt/internal/Act.scala @@ -178,15 +178,16 @@ object Act { ): Seq[Parser[ParsedKey]] = for { conf <- configs(confAmb, defaultConfigs, proj, index) - } yield for { - taskAmb <- taskAxis(index.tasks(proj, conf), keyMap) - task = resolveTask(taskAmb) - key <- key(index, proj, conf, task, keyMap) - extra <- extraAxis(keyMap, IMap.empty) - } yield { - val mask = baseMask.copy(task = taskAmb.isExplicit, extra = true) - ParsedKey(makeScopedKey(proj, conf, task, extra, key), mask) - } + } yield + for { + taskAmb <- taskAxis(index.tasks(proj, conf), keyMap) + task = resolveTask(taskAmb) + key <- key(index, proj, conf, task, keyMap) + extra <- extraAxis(keyMap, IMap.empty) + } yield { + val mask = baseMask.copy(task = taskAmb.isExplicit, extra = true) + ParsedKey(makeScopedKey(proj, conf, task, extra, key), mask) + } def makeScopedKey( proj: Option[ResolvedReference], @@ -246,7 +247,7 @@ object Act { private def keys(ss: Seq[ParsedKey]): Seq[ScopedKey[?]] = ss.map(_.key) def selectByConfig(ss: Seq[ParsedKey]): Seq[ParsedKey] = ss match { - case Seq() => Nil + case Seq() => Nil case Seq(x, tail*) => // select the first configuration containing a valid key tail.takeWhile(_.key.scope.config == x.key.scope.config) match { case Seq() => x :: Nil @@ -531,7 +532,7 @@ object Act { for keys <- action match - case SingleAction => akp + case SingleAction => akp case ShowAction | PrintAction | MultiAction => for pairs <- rep1sep(akp, token(Space)) yield pairs.flatten @@ -547,7 +548,7 @@ object Act { structure: BuildStructure, ): Seq[(ScopedKey[?], Option[ProjectQuery])] = pairs.filter { - case (_, None) => true + case (_, None) => true case (keys, Some(query)) => val f = query.buildQuery(structure) keys.scope.project.toOption match diff --git a/main/src/main/scala/sbt/internal/Aggregation.scala b/main/src/main/scala/sbt/internal/Aggregation.scala index 6e1105484..14b193f48 100644 --- a/main/src/main/scala/sbt/internal/Aggregation.scala +++ b/main/src/main/scala/sbt/internal/Aggregation.scala @@ -55,7 +55,7 @@ object Aggregation { xs match { case Seq(KeyValue(_, x: Seq[?])) => print(x.mkString("* ", "\n* ", "")) case Seq(KeyValue(_, x)) => print(x.toString) - case _ => + case _ => xs foreach { kv => print(display.show(kv.key)) kv.value match { diff --git a/main/src/main/scala/sbt/internal/AnalysisUtil.scala b/main/src/main/scala/sbt/internal/AnalysisUtil.scala index 28db3eb47..61216c6e8 100644 --- a/main/src/main/scala/sbt/internal/AnalysisUtil.scala +++ b/main/src/main/scala/sbt/internal/AnalysisUtil.scala @@ -11,7 +11,7 @@ package internal import java.nio.file.Path import sbt.internal.inc.MixedAnalyzingCompiler -import xsbti.compile.{ AnalysisStore as XAnalysisStore } +import xsbti.compile.AnalysisStore as XAnalysisStore import xsbti.compile.analysis.ReadWriteMappers private[sbt] object AnalysisUtil { diff --git a/main/src/main/scala/sbt/internal/BuildDef.scala b/main/src/main/scala/sbt/internal/BuildDef.scala index a05f3c258..540c09530 100644 --- a/main/src/main/scala/sbt/internal/BuildDef.scala +++ b/main/src/main/scala/sbt/internal/BuildDef.scala @@ -107,7 +107,7 @@ private[sbt] object BuildDef: ): Option[AnalysisContents] = Option(inMemoryAnalysisCache.getIfPresent(ref.id())) match case Some((v, mod, i)) if lastModified == mod && sizeBytes == i => v - case _ => + case _ => val v = value inMemoryAnalysisCache.put(ref.id(), (v, lastModified, sizeBytes)) v diff --git a/main/src/main/scala/sbt/internal/BuildLoader.scala b/main/src/main/scala/sbt/internal/BuildLoader.scala index 1d48ab04f..97ba48d53 100644 --- a/main/src/main/scala/sbt/internal/BuildLoader.scala +++ b/main/src/main/scala/sbt/internal/BuildLoader.scala @@ -32,7 +32,7 @@ final class MultiHandler[S, T]( def applyFun: S => Option[T] = apply def apply(info: S): Option[T] = (baseLoader(info), applyNonRoots(info)) match { - case (None, Nil) => None + case (None, Nil) => None case (None, xs @ (_, nr) :: ignored) => if (ignored.nonEmpty) warn( diff --git a/main/src/main/scala/sbt/internal/BuildStructure.scala b/main/src/main/scala/sbt/internal/BuildStructure.scala index 28e4ba8fb..ed43e66f8 100644 --- a/main/src/main/scala/sbt/internal/BuildStructure.scala +++ b/main/src/main/scala/sbt/internal/BuildStructure.scala @@ -393,7 +393,7 @@ object BuildStreams { case Zero => refTarget(GlobalScope, units(root).localBase, data) / GlobalPath case Select(br @ BuildRef(uri)) => refTarget(br, units(uri).localBase, data) / BuildUnitPath case Select(pr @ ProjectRef(uri, id)) => refTarget(pr, units(uri).defined(id).base, data) - case Select(pr) => + case Select(pr) => sys.error("Unresolved project reference (" + pr + ") in " + displayFull(scoped)) case This => sys.error("Unresolved project reference (This) in " + displayFull(scoped)) } diff --git a/main/src/main/scala/sbt/internal/ClassLoaders.scala b/main/src/main/scala/sbt/internal/ClassLoaders.scala index 9a77c9658..047cd27e9 100644 --- a/main/src/main/scala/sbt/internal/ClassLoaders.scala +++ b/main/src/main/scala/sbt/internal/ClassLoaders.scala @@ -231,7 +231,7 @@ private[sbt] object ClassLoaders { case cl => cl.getParent match { case dl: ReverseLookupClassLoaderHolder => dl.checkout(cpFiles, tmp) - case _ => + case _ => new LayeredClassLoader(dynamicClasspath.urls, cl, tmp, close, allowZombies, logger) } } @@ -245,7 +245,7 @@ private[sbt] object ClassLoaders { private def modifiedTimes(stamps: Seq[(Path, FileStamp)]): Seq[(File, Long)] = stamps.map { case (p, LastModified(lm)) => p.toFile -> lm - case (p, _) => + case (p, _) => val f = p.toFile f -> IO.getModifiedTimeOrZero(f) } diff --git a/main/src/main/scala/sbt/internal/ClasspathImpl.scala b/main/src/main/scala/sbt/internal/ClasspathImpl.scala index 3ed91658d..094453293 100644 --- a/main/src/main/scala/sbt/internal/ClasspathImpl.scala +++ b/main/src/main/scala/sbt/internal/ClasspathImpl.scala @@ -420,7 +420,7 @@ private[sbt] object ClasspathImpl { )(confString: String): String => Seq[String] = { val ms: Seq[(String, Seq[String])] = trim(confString.split("->", 2)) match { - case x :: Nil => for (a <- parseList(x, masterConfs)) yield (a, default(a)) + case x :: Nil => for (a <- parseList(x, masterConfs)) yield (a, default(a)) case x :: y :: Nil => val target = parseList(y, depConfs); for (a <- parseList(x, masterConfs)) yield (a, target) @@ -491,7 +491,7 @@ private[sbt] object ClasspathImpl { index: Map[String, Set[String]], ): Boolean = index.get(mid.organization) match - case None => false + case None => false case Some(names) => names.exists(n => mid.name == n || mid.name.startsWith(n + "_")) @@ -517,7 +517,7 @@ private[sbt] object ClasspathImpl { val index = directDepIndex(directDeps) val rootKey = (projectId.organization, projectId.name) fullReport.configuration(ConfigRef(config.name)) match - case None => jars + case None => jars case Some(configReport) => val modules = configReport.modules // Callers use resolved names (e.g., cats-core_3). diff --git a/main/src/main/scala/sbt/internal/Clean.scala b/main/src/main/scala/sbt/internal/Clean.scala index 9d0094ce3..4b1ab49fc 100644 --- a/main/src/main/scala/sbt/internal/Clean.scala +++ b/main/src/main/scala/sbt/internal/Clean.scala @@ -23,7 +23,7 @@ import sbt.io.IO import sbt.nio.Keys.* import sbt.nio.file.* import sbt.nio.file.syntax.pathToPathOps -import sbt.nio.file.Glob.{ GlobOps } +import sbt.nio.file.Glob.GlobOps import sbt.util.{ DiskActionCacheStore, Level } import sbt.internal.util.complete.SizeParser import sjsonnew.JsonFormat diff --git a/main/src/main/scala/sbt/internal/CommandExchange.scala b/main/src/main/scala/sbt/internal/CommandExchange.scala index c1877a944..6afc88a07 100644 --- a/main/src/main/scala/sbt/internal/CommandExchange.scala +++ b/main/src/main/scala/sbt/internal/CommandExchange.scala @@ -130,7 +130,7 @@ private[sbt] final class CommandExchange { case _ => exec } case Some(e) => e - case None => + case None => val newDeadline = if (gcDeadline.fold(false)(_.isOverdue())) { GCUtil.forceGcWithInterval(interval, logger) None @@ -411,7 +411,7 @@ private[sbt] final class CommandExchange { lastActivityTime.set(System.currentTimeMillis) channels.foreach { case c if ContinuousCommands.isInWatch(lastState.get, c) => - case c => + case c => if c.isPaused then () else c.prompt(event) } @@ -577,11 +577,11 @@ private[sbt] final class CommandExchange { } @tailrec def impl(): Unit = { fastTrackChannelQueue.take match { - case null => + case null => case mt: FastTrackTask => mt.task match { case `attach` | "" => mt.channel.prompt(ConsolePromptEvent(lastState.get)) - case `Cancel` => + case `Cancel` => Option(currentExecRef.get).foreach(cancel) mt.channel.prompt(ConsolePromptEvent(lastState.get)) case t if t.startsWith(ContinuousCommands.stopWatch) => @@ -591,7 +591,7 @@ private[sbt] final class CommandExchange { } commandQueue.add(Exec(t, None, None)) case `TerminateAction` => exit(mt) - case `Shutdown` => + case `Shutdown` => val console = Terminal.console val needNewLine = console.prompt.isInstanceOf[Prompt.AskUser] console.setPrompt(Prompt.Batch) diff --git a/main/src/main/scala/sbt/internal/Compiler.scala b/main/src/main/scala/sbt/internal/Compiler.scala index 35d54940d..2894af759 100644 --- a/main/src/main/scala/sbt/internal/Compiler.scala +++ b/main/src/main/scala/sbt/internal/Compiler.scala @@ -64,7 +64,7 @@ object Compiler: val managed = Keys.managedScalaInstance.value val configs = Keys.ivyConfigurations.value (sh, extraToolConf) match - case (Some(h), _) => scalaInstanceConfigFromHome(h) + case (Some(h), _) => scalaInstanceConfigFromHome(h) case _ if !managed => val extra = extraToolConf.getOrElse(Configurations.ScalaTool) if configs.contains(extra) then scalaInstanceConfigFromUpdate(extraToolConf) @@ -191,7 +191,8 @@ object Compiler: """Upgrade the `scalaVersion` to fix the build. If upgrading the Scala compiler version is |not possible (for example due to a regression in the compiler or a missing dependency), |this error can be demoted by setting `allowUnsafeScalaLibUpgrade := true`.""".stripMargin - else s"""Note that the dependency classpath and the runtime classpath of your project + else + s"""Note that the dependency classpath and the runtime classpath of your project |contain the newer $libName $libVer, even if the scalaVersion is $sv. |Compilation (macro expansion) or using the Scala REPL in sbt may fail with a LinkageError.""".stripMargin val msg = diff --git a/main/src/main/scala/sbt/internal/Continuous.scala b/main/src/main/scala/sbt/internal/Continuous.scala index 96ac9de35..6596270fb 100644 --- a/main/src/main/scala/sbt/internal/Continuous.scala +++ b/main/src/main/scala/sbt/internal/Continuous.scala @@ -176,7 +176,7 @@ private[sbt] object Continuous { // Extract all of the globs that we will monitor during the continuous build. val inputs = { val configs = scopedKey.get(internalDependencyConfigurations).getOrElse(Nil) - import WatchTransitiveDependencies.{ Arguments as DArguments } + import WatchTransitiveDependencies.Arguments as DArguments val args = new DArguments(scopedKey, extracted, compiledMap, logger, configs, state) WatchTransitiveDependencies.transitiveDynamicInputs(args) } @@ -204,7 +204,7 @@ private[sbt] object Continuous { private[sbt] def validateCommands(state: State, commands: Seq[String]): Unit = { commands.filter(cmd => Parser.parse(cmd, state.combinedParser).isLeft) match { case invalid if invalid.isEmpty => - case invalid => + case invalid => val msg = s"Invalid commands: ${invalid.mkString("'", "', '", ",")}" throw new IllegalArgumentException(msg) } @@ -222,14 +222,14 @@ private[sbt] object Continuous { @tailrec def impl(current: String): Seq[ScopedKey[?]] = { Parser.parse(current, scopedKeyParser) match { case Right(scopedKeys: Seq[ScopedKey[?]]) => scopedKeys - case Left(e) => + case Left(e) => val aliases = BasicCommands.allAliases(state) aliases.collectFirst { case (`command`, aliased) => aliased } match { case Some(aliased) => impl(aliased) - case None => + case None => Parser.parse(command, state.combinedParser) match { case Right(_) => globalWatchSettingKey.scopedKey :: Nil - case _ => + case _ => val msg = s"Error attempting to extract scope from $command: $e." throw new IllegalStateException(msg) } @@ -407,7 +407,7 @@ private[sbt] object Continuous { if (configs.size == 1) { // Only allow custom start messages for single tasks ws.startMessage match case Some(sm) => sm(count, project, commands).foreach(logger.info(_)) - case None => + case None => Watch.defaultStartWatch(count, project, commands).foreach(logger.info(_)) } Watch.Ignore @@ -541,8 +541,8 @@ private[sbt] object Continuous { } } else { fileStampCache.update(path, FileStamper.Hash) match { - case (None, Some(_)) => Some(Creation(event)) - case (Some(_), None) => Some(Deletion(event)) + case (None, Some(_)) => Some(Creation(event)) + case (Some(_), None) => Some(Deletion(event)) case (Some(p), Some(c)) => if (forceTrigger) { val msg = @@ -1214,7 +1214,7 @@ private[sbt] object ContinuousCommands { val extracted = Project.extract(state) val repo = state.get(globalFileTreeRepository) match { case Some(r) => localRepo(r) - case _ => + case _ => throw new IllegalStateException(s"No file tree repository was found for $state") } val cache = new FileStamp.Cache @@ -1250,7 +1250,7 @@ private[sbt] object ContinuousCommands { }, afterCommand = state => { val newWatchState = state.get(watchStates) match { - case None => state + case None => state case Some(ws) => ws.get(channelName) match { case None => state @@ -1295,7 +1295,7 @@ private[sbt] object ContinuousCommands { } { case (_, newState) => newState() } private[sbt] val runWatchCommand = watchCommand(runWatch) { (channel, state) => state.get(watchStates).flatMap(_.get(channel)) match { - case None => state + case None => state case Some(cs) => val pre = StashOnFailure :: s"$preWatch $channel" :: Nil val post = FailureWall :: PopOnFailure :: s"$postWatch $channel" :: Nil @@ -1326,7 +1326,7 @@ private[sbt] object ContinuousCommands { ) } val ws = state.get(watchStates) match { - case None => throw new IllegalStateException("no watch states") + case None => throw new IllegalStateException("no watch states") case Some(ws) => ws.get(channel.name) .getOrElse(throw new IllegalStateException(s"no watch state for ${channel.name}")) @@ -1335,7 +1335,7 @@ private[sbt] object ContinuousCommands { // Use a Left so that the client can immediately exit watch via case Watch.CancelWatch => Left(s"$stopWatch ${channel.name}") case Watch.Trigger => Right(s"$runWatch ${channel.name}") - case Watch.Reload => + case Watch.Reload => val rewatch = s"$ContinuousExecutePrefix ${ws.count} ${cs.commands mkString "; "}" cs.terminationAction = Some(Watch.Reload) stop.map(_ :: "reload" :: rewatch :: Nil mkString "; ") diff --git a/main/src/main/scala/sbt/internal/CrossJava.scala b/main/src/main/scala/sbt/internal/CrossJava.scala index 813dd4c33..e23e79ffc 100644 --- a/main/src/main/scala/sbt/internal/CrossJava.scala +++ b/main/src/main/scala/sbt/internal/CrossJava.scala @@ -69,7 +69,7 @@ private[sbt] object CrossJava { } splitDash(version) match { case xs if xs.size < 2 => sys.error(s"Invalid SDKMAN Java version: $version") - case xs => + case xs => val first = xs.init.head val ds = if (!first.contains(".") && first.contains("u")) splitDot(first.replaceFirst("u", ".0.")) @@ -221,7 +221,7 @@ private[sbt] object CrossJava { if (switch.target.force) projectJavaVersions else switch.target.version match { - case None => projectJavaVersions + case None => projectJavaVersions case Some(v) => projectJavaVersions flatMap { (proj, versions) => if (versions.isEmpty || versions.contains[String](v.toString)) @@ -467,7 +467,7 @@ private[sbt] object CrossJava { } .flatMap { case x if vendors.isEmpty => Vector(x) - case (version, home) => + case (version, home) => val jv = JavaVersion(version) vendors.map(jv.withVendor(_).toString -> home) } diff --git a/main/src/main/scala/sbt/internal/DefaultBackgroundJobService.scala b/main/src/main/scala/sbt/internal/DefaultBackgroundJobService.scala index 45cb3038d..fce6a6cf6 100644 --- a/main/src/main/scala/sbt/internal/DefaultBackgroundJobService.scala +++ b/main/src/main/scala/sbt/internal/DefaultBackgroundJobService.scala @@ -210,7 +210,7 @@ private[sbt] abstract class AbstractBackgroundJobService extends BackgroundJobSe private def withHandle(job: JobHandle)(f: ThreadJobHandle => Unit): Unit = job match { case handle: ThreadJobHandle @unchecked => f(handle) case _: DeadHandle @unchecked => () // nothing to stop or wait for - case other => + case other => sys.error( s"BackgroundJobHandle does not originate with the current BackgroundJobService: $other" ) @@ -570,7 +570,7 @@ private[sbt] object DefaultBackgroundJobService { val newService = new DefaultBackgroundJobService(path) backgroundJobServices.putIfAbsent(path, newService) match { case null => newService - case s => + case s => newService.shutdown() s } diff --git a/main/src/main/scala/sbt/internal/FileChangesMacro.scala b/main/src/main/scala/sbt/internal/FileChangesMacro.scala index 29d0b8ce0..171948dc9 100644 --- a/main/src/main/scala/sbt/internal/FileChangesMacro.scala +++ b/main/src/main/scala/sbt/internal/FileChangesMacro.scala @@ -9,7 +9,7 @@ package sbt package internal -import java.nio.file.{ Path as NioPath } +import java.nio.file.Path as NioPath import sbt.ScopeAxis.Select import sbt.nio.Keys.* diff --git a/main/src/main/scala/sbt/internal/InMemoryCacheStore.scala b/main/src/main/scala/sbt/internal/InMemoryCacheStore.scala index 5f0359952..39d872328 100644 --- a/main/src/main/scala/sbt/internal/InMemoryCacheStore.scala +++ b/main/src/main/scala/sbt/internal/InMemoryCacheStore.scala @@ -69,7 +69,7 @@ private[sbt] object InMemoryCacheStore { val lastModified = IO.getModifiedTimeOrZero(path.toFile) store.get[T](path) match { case Some((v, `lastModified`)) if v == value => // nothing has changed - case _ => + case _ => store.remove(path) cacheStore.write(value) val newLastModified = System.currentTimeMillis diff --git a/main/src/main/scala/sbt/internal/IncrementalTest.scala b/main/src/main/scala/sbt/internal/IncrementalTest.scala index 18b8c36eb..3a70b4fda 100644 --- a/main/src/main/scala/sbt/internal/IncrementalTest.scala +++ b/main/src/main/scala/sbt/internal/IncrementalTest.scala @@ -88,7 +88,7 @@ object IncrementalTest: (includeFilters, excludeArgs) match case (Nil, Nil) => Seq(const(true)) case (Nil, _) => Seq((s: String) => !matches(excludeFilters, s)) - case _ => + case _ => includeFilters.map(f => (s: String) => (f.accept(s) && !matches(excludeFilters, s))) private[sbt] def cacheInput( diff --git a/main/src/main/scala/sbt/internal/Inspect.scala b/main/src/main/scala/sbt/internal/Inspect.scala index 27b1b201d..c1a485d1b 100644 --- a/main/src/main/scala/sbt/internal/Inspect.scala +++ b/main/src/main/scala/sbt/internal/Inspect.scala @@ -87,7 +87,7 @@ object Inspect { val extracted = Project.extract(s) import extracted.{ *, given } option match { - case Details(actual) => Project.details(extracted.structure, actual, sk) + case Details(actual) => Project.details(extracted.structure, actual, sk) case DependencyTreeMode => val basedir = new File(Project.session(s).current.build) Project diff --git a/main/src/main/scala/sbt/internal/InstallSbtn.scala b/main/src/main/scala/sbt/internal/InstallSbtn.scala index cb1acb627..9da7813ae 100644 --- a/main/src/main/scala/sbt/internal/InstallSbtn.scala +++ b/main/src/main/scala/sbt/internal/InstallSbtn.scala @@ -41,7 +41,7 @@ private[sbt] object InstallSbtn { val shell = if (hasConsole) getShell(term) else "none" shell match { case "none" => - case s => + case s => val completion = shellCompletions(s) val completionLocation = baseDirectory.resolve("completions").resolve(completion) downloadCompletion(completion, version, completionLocation) @@ -164,7 +164,7 @@ private[sbt] object InstallSbtn { term.printStream.flush() term.inputStream.read() match { case 110 => term.printStream.println() - case c => + case c => term.printStream.println(c.toChar) // put the export at the bottom so that the ~/.sbt/1.0/bin/sbtn is least preferred // but still on the path @@ -179,7 +179,7 @@ private[sbt] object InstallSbtn { term.printStream.flush() term.inputStream.read() match { case 110 => - case c => + case c => term.printStream.println(c.toChar) if (shell == "zsh") { // delete the .zcompdump file because it can prevent the new completions from diff --git a/main/src/main/scala/sbt/internal/LayeredClassLoaders.scala b/main/src/main/scala/sbt/internal/LayeredClassLoaders.scala index 4a0613242..4d60b1b95 100644 --- a/main/src/main/scala/sbt/internal/LayeredClassLoaders.scala +++ b/main/src/main/scala/sbt/internal/LayeredClassLoaders.scala @@ -121,7 +121,7 @@ private[internal] class NativeLookup extends NativeLoader { case null => findLibrary0(name) match { case null => null - case n => + case n => mapped.put(name, n) NativeLibs.addNativeLib(n) n diff --git a/main/src/main/scala/sbt/internal/LibraryManagement.scala b/main/src/main/scala/sbt/internal/LibraryManagement.scala index bf1f55b68..ecf655e90 100644 --- a/main/src/main/scala/sbt/internal/LibraryManagement.scala +++ b/main/src/main/scala/sbt/internal/LibraryManagement.scala @@ -13,7 +13,7 @@ import java.io.{ File, IOException } import java.net.{ URI, URL } import java.util.concurrent.Callable -import gigahorse.{ AuthScheme } +import gigahorse.AuthScheme import gigahorse.support.apachehttp.Gigahorse import sbt.Def.ScopedKey import sbt.internal.librarymanagement.* @@ -66,7 +66,7 @@ private[sbt] object LibraryManagement { val reportOrUnresolved: Either[UnresolvedWarning, UpdateReport] = lm.update(module, updateConfig, uwConfig, log) val report = reportOrUnresolved match { - case Right(report0) => report0 + case Right(report0) => report0 case Left(unresolvedWarning) => unresolvedWarning.lines.foreach(log.warn(_)) throw unresolvedWarning.resolveException @@ -128,7 +128,7 @@ private[sbt] object LibraryManagement { val cachedReport = Tracked .lastOutput[UpdateInputs, UpdateReport](cache) { case (_, Some(out)) => out - case _ => + case _ => sys.error("Skipping update requested, but update has not previously run successfully.") } .apply(inputs) @@ -236,7 +236,7 @@ private[sbt] object LibraryManagement { val mod = lm.moduleDescriptor(base, dependencies, scalaModuleInfo) val report = lm.update(mod, updateConfiguration, uwconfig, log) match { case Right(r) => r - case Left(w) => + case Left(w) => throw w.resolveException } val key = (m: ModuleID) => (m.organization, m.name, m.revision) @@ -370,7 +370,7 @@ private[sbt] object LibraryManagement { // following copied from https://github.com/coursier/sbt-coursier/blob/9173406bb399879508aa481fed16efda72f55820/modules/sbt-lm-coursier/src/main/scala/sbt/hack/Foo.scala val shouldForce = isRoot || { fup match - case None => false + case None => false case Some(period) => val fullUpdateOutput = cacheDirectory / "output" val now = System.currentTimeMillis @@ -596,7 +596,7 @@ private[sbt] object LibraryManagement { val digestAlgo = algo.toLowerCase match case "md5" => sbt.util.Digest.Md5 case "sha1" => sbt.util.Digest.Sha1 - case other => + case other => throw new IllegalArgumentException(s"Unsupported checksum algorithm: $other") val digest = sbt.util.Digest(digestAlgo, file.toPath) val checksumFile = new File(file.getPath + "." + algo.toLowerCase) @@ -734,7 +734,7 @@ private[sbt] object LibraryManagement { val digestAlgo = algo.toLowerCase match case "md5" => sbt.util.Digest.Md5 case "sha1" => sbt.util.Digest.Sha1 - case other => + case other => throw new IllegalArgumentException(s"Unsupported checksum algorithm: $other") val digest = sbt.util.Digest(digestAlgo, file.toPath) val content = digest.hashHexString @@ -816,7 +816,7 @@ private[sbt] object LibraryManagement { val digestAlgo = algo.toLowerCase match case "md5" => sbt.util.Digest.Md5 case "sha1" => sbt.util.Digest.Sha1 - case other => + case other => throw new IllegalArgumentException(s"Unsupported checksum algorithm: $other") val digest = sbt.util.Digest(digestAlgo, targetFile.toPath) val checksumFile = new File(targetFile.getPath + "." + algo.toLowerCase) @@ -881,7 +881,7 @@ private[sbt] object LibraryManagement { val digestAlgo = algo.toLowerCase match case "md5" => sbt.util.Digest.Md5 case "sha1" => sbt.util.Digest.Sha1 - case other => + case other => throw new IllegalArgumentException(s"Unsupported checksum algorithm: $other") val digest = sbt.util.Digest(digestAlgo, file.toPath) val content = digest.hashHexString diff --git a/main/src/main/scala/sbt/internal/Load.scala b/main/src/main/scala/sbt/internal/Load.scala index b77bb8c1e..5de3212bd 100755 --- a/main/src/main/scala/sbt/internal/Load.scala +++ b/main/src/main/scala/sbt/internal/Load.scala @@ -590,7 +590,7 @@ private[sbt] object Load { def addResolvers(unit: BuildUnit, isRoot: Boolean, loaders: BuildLoader): BuildLoader = unit.definitions.builds.flatMap(_.buildLoaders).toList match { - case Nil => loaders + case Nil => loaders case x :: xs => val resolver = xs.foldLeft(x) { _ | _ } if (isRoot) loaders.setRoot(resolver) else loaders.addNonRoot(unit.uri, resolver) @@ -686,7 +686,7 @@ private[sbt] object Load { ref match case LocalAggregate => () case ThisProject => () - case _ => + case _ => val ProjectRef(refURI, refID) = Scope.resolveProjectRef(uri, rootProject, ref) val loadedUnit = builds(refURI) if (!loadedUnit.defined.contains(refID)) { @@ -1236,7 +1236,7 @@ private[sbt] object Load { def expandPluginSettings(auto: AddSettings): Seq[Setting[?]] = auto match case p: AutoPlugins => autoPluginSettings(p) - case q: Sequence => + case q: Sequence => q.sequence.foldLeft(Seq.empty[Setting[?]]) { (b, add) => b ++ expandPluginSettings(add) } @@ -1249,7 +1249,7 @@ private[sbt] object Load { auto match case User => machineWideUserSettings.cachedProjectLoaded(loadedPlugins.loader) case BuildScalaFiles => p.settings - case q: Sequence => + case q: Sequence => q.sequence.foldLeft(Seq.empty[Setting[?]]) { (b, add) => b ++ expandSettings(add) } @@ -1287,7 +1287,7 @@ private[sbt] object Load { def expandCommonSettings(auto: AddSettings): Vector[Setting[?]] = auto match case sf: DefaultSbtFiles => settings(sbtFiles.filter(sf.include)) - case q: Sequence => + case q: Sequence => q.sequence.foldLeft(Vector.empty[Setting[?]]) { (b, add) => b ++ expandCommonSettings(add) } diff --git a/main/src/main/scala/sbt/internal/RunUtil.scala b/main/src/main/scala/sbt/internal/RunUtil.scala index 1fb0376f8..fdcb1d51b 100644 --- a/main/src/main/scala/sbt/internal/RunUtil.scala +++ b/main/src/main/scala/sbt/internal/RunUtil.scala @@ -7,7 +7,7 @@ import sbt.Def.* import sbt.Keys.* import sbt.ScopeAxis.This import sbt.SlashSyntax0.* -import sbt.internal.util.{ Terminal as ITerminal } +import sbt.internal.util.Terminal as ITerminal import sbt.internal.worker.{ ClientJobParams, FilePath, JvmRunInfo, RunInfo } import sbt.io.IO import sbt.protocol.Serialization diff --git a/main/src/main/scala/sbt/internal/Script.scala b/main/src/main/scala/sbt/internal/Script.scala index a849d4ca0..5ea25444b 100644 --- a/main/src/main/scala/sbt/internal/Script.scala +++ b/main/src/main/scala/sbt/internal/Script.scala @@ -15,7 +15,7 @@ import sbt.util.Level import java.io.File import Keys.* -import EvaluateConfigurations.{ evaluateConfiguration as evaluate } +import EvaluateConfigurations.evaluateConfiguration as evaluate import Configurations.Compile import Scope.Global import sbt.ProjectExtra.{ extract, setProject } diff --git a/main/src/main/scala/sbt/internal/SettingCompletions.scala b/main/src/main/scala/sbt/internal/SettingCompletions.scala index 0f4157eb1..bf1dd88d8 100644 --- a/main/src/main/scala/sbt/internal/SettingCompletions.scala +++ b/main/src/main/scala/sbt/internal/SettingCompletions.scala @@ -13,7 +13,7 @@ import sbt.internal.util.{ AttributeKey, complete, Relation, Util } import sbt.util.Show import sbt.librarymanagement.Configuration -import ProjectExtra.{ relation } +import ProjectExtra.relation import Def.{ ScopedKey, Setting } import Scope.Global import sbt.ScopeAxis.{ Select, This, Zero } diff --git a/main/src/main/scala/sbt/internal/SysProp.scala b/main/src/main/scala/sbt/internal/SysProp.scala index f8246fde9..17c19c10b 100644 --- a/main/src/main/scala/sbt/internal/SysProp.scala +++ b/main/src/main/scala/sbt/internal/SysProp.scala @@ -29,7 +29,7 @@ object SysProp: def booleanOpt(name: String): Option[Boolean] = sys.props.get(name) match { case Some(x) => parseBoolean(x) - case _ => + case _ => sys.env.get(name.toUpperCase(Locale.ENGLISH).replace('.', '_')) match { case Some(x) => parseBoolean(x) case _ => None @@ -168,7 +168,7 @@ object SysProp: case "us" => ("µs", 3) case "ms" => ("ms", 6) case "s" => ("sec", 9) - case x => + case x => System.err.println(s"Unknown sbt.task.timings.unit: $x.\nUsing milliseconds.") ("ms", 6) } @@ -181,7 +181,7 @@ object SysProp: def genBuildProps: Boolean = booleanOpt("sbt.genbuildprops") match { case Some(x) => x - case None => + case None => booleanOpt("sbt.skip.version.write") match { case Some(skip) => !skip case None => true @@ -194,7 +194,7 @@ object SysProp: case "reload" => ReloadOnSourceChanges case "warn" => WarnOnSourceChanges case "ignore" => IgnoreSourceChanges - case unknown => + case unknown => System.err.println(s"Unknown $sysPropKey: $unknown.\nUsing warn.") sbt.nio.Keys.WarnOnSourceChanges diff --git a/main/src/main/scala/sbt/internal/TaskProgress.scala b/main/src/main/scala/sbt/internal/TaskProgress.scala index 60999dd74..1074fffa3 100644 --- a/main/src/main/scala/sbt/internal/TaskProgress.scala +++ b/main/src/main/scala/sbt/internal/TaskProgress.scala @@ -100,7 +100,7 @@ private[sbt] class TaskProgress( val loop = schedule(sleepDuration, recurring = true)(doReport()) reportLoop.getAndSet(loop) match { case null => - case l => + case l => reportLoop.set(l) loop.close() } @@ -129,7 +129,7 @@ private[sbt] class TaskProgress( override def afterCompleted[A](task: TaskId[A], result: Result[A]): Unit = active.remove(task) match { case null => - case a => + case a => a.close() if (exceededThreshold(task, threshold)) report() } @@ -195,7 +195,7 @@ private[sbt] class TaskProgress( val name = taskName(task) name.lastIndexOf('/') match { case -1 => name - case i => + case i => var j = i + 1 while (name(j) == ' ') j += 1 name.substring(j) diff --git a/main/src/main/scala/sbt/internal/TaskSequential.scala b/main/src/main/scala/sbt/internal/TaskSequential.scala index e1e50a3cb..1cfab1155 100644 --- a/main/src/main/scala/sbt/internal/TaskSequential.scala +++ b/main/src/main/scala/sbt/internal/TaskSequential.scala @@ -769,7 +769,7 @@ trait TaskSequential { last: Initialize[Task[B]] ): Initialize[Task[B]] = tasks.toList match { - case Nil => Def.task { last.value } + case Nil => Def.task { last.value } case x :: xs => Def.task { Def.unit(x.value) }.flatMapTask { case _ => sequential(xs, last) diff --git a/main/src/main/scala/sbt/internal/TestCommand.scala b/main/src/main/scala/sbt/internal/TestCommand.scala index 7a927d33c..59daf172c 100644 --- a/main/src/main/scala/sbt/internal/TestCommand.scala +++ b/main/src/main/scala/sbt/internal/TestCommand.scala @@ -14,7 +14,7 @@ import sbt.ProjectExtra.* import sbt.ScopeAxis.{ Select, Zero } import sbt.SessionVar import sbt.internal.util.complete.Parser -import sbt.librarymanagement.Configurations.{ Test as TestConfig } +import sbt.librarymanagement.Configurations.Test as TestConfig /** * Provides commands for running tests with aggregation-aware failure semantics. diff --git a/main/src/main/scala/sbt/internal/VirtualFileValueCache.scala b/main/src/main/scala/sbt/internal/VirtualFileValueCache.scala index 9afbef2c1..41d65f594 100644 --- a/main/src/main/scala/sbt/internal/VirtualFileValueCache.scala +++ b/main/src/main/scala/sbt/internal/VirtualFileValueCache.scala @@ -13,7 +13,7 @@ import java.util.concurrent.ConcurrentHashMap import sbt.internal.inc.Stamper import xsbti.{ FileConverter, VirtualFile, VirtualFileRef } import xsbti.compile.DefinesClass -import xsbti.compile.analysis.{ Stamp as XStamp } +import xsbti.compile.analysis.Stamp as XStamp import sbt.internal.inc.Locate /** diff --git a/main/src/main/scala/sbt/internal/librarymanagement/DependencyLockManager.scala b/main/src/main/scala/sbt/internal/librarymanagement/DependencyLockManager.scala index 7c7a44cbc..df87f3f34 100644 --- a/main/src/main/scala/sbt/internal/librarymanagement/DependencyLockManager.scala +++ b/main/src/main/scala/sbt/internal/librarymanagement/DependencyLockManager.scala @@ -18,7 +18,7 @@ object DependencyLockManager: def read(lockFile: File, log: Logger): Option[LockFileData] = LockFile.read(lockFile) match case Right(data) => Some(data) - case Left(err) => + case Left(err) => if lockFile.exists() then log.warn(s"Failed to read lock file: $err") None diff --git a/main/src/main/scala/sbt/internal/server/BuildServerEvalReporter.scala b/main/src/main/scala/sbt/internal/server/BuildServerEvalReporter.scala index c8ec33270..99a99af29 100644 --- a/main/src/main/scala/sbt/internal/server/BuildServerEvalReporter.scala +++ b/main/src/main/scala/sbt/internal/server/BuildServerEvalReporter.scala @@ -10,7 +10,7 @@ package sbt.internal.server import dotty.tools.dotc.core.Contexts.Context import dotty.tools.dotc.reporting.Reporter -import dotty.tools.dotc.reporting.{ Diagnostic as ScalaDiagnostic } +import dotty.tools.dotc.reporting.Diagnostic as ScalaDiagnostic import dotty.tools.dotc.util.SourcePosition import sbt.StandardMain.exchange import sbt.internal.EvalReporter diff --git a/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala b/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala index 29043daa2..6a55a5a9e 100644 --- a/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala +++ b/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala @@ -875,7 +875,7 @@ object BuildServerProtocol { private def bspCompileTask: Def.Initialize[Task[Int]] = Def.task { Keys.compile.result.value match { - case Result.Value(_) => StatusCode.Success + case Result.Value(_) => StatusCode.Success case Result.Inc(cause) => cause.getCause match { case _: InterruptedException => StatusCode.Cancelled @@ -954,7 +954,7 @@ object BuildServerProtocol { val testTasks: Seq[Def.Initialize[Task[Unit]]] = items.map { item => val scope = workspace.scopes(item.target) item.classes.toList match { - case Nil => Def.task(()) + case Nil => Def.task(()) case classes => (scope / testOnly) .toTask(" " + classes.mkString(" ")) @@ -1054,7 +1054,7 @@ object BuildServerProtocol { private def scalaTestClassesTask: Initialize[Task[Seq[ScalaTestClassesItem]]] = Def.task { Keys.definedTests.?.value match { - case None => Vector.empty + case None => Vector.empty case Some(definitions) => val frameworks: Seq[Framework] = Keys.loadedTestFrameworks.?.value .map(_.values.toSeq) diff --git a/main/src/main/scala/sbt/internal/server/Definition.scala b/main/src/main/scala/sbt/internal/server/Definition.scala index 0521d580b..ad212cc4a 100644 --- a/main/src/main/scala/sbt/internal/server/Definition.scala +++ b/main/src/main/scala/sbt/internal/server/Definition.scala @@ -186,7 +186,7 @@ private[sbt] object Definition { )(cacheFile: String, useBinary: Boolean, useConsistent: Boolean): Any = { cache.get(AnalysesKey, k => Set((cacheFile, useBinary, useConsistent) -> None)) match { case null => new AnyRef - case set => + case set => val newSet = set .filterNot { case ((file, _, _), _) => file == cacheFile } .+((cacheFile, useBinary, useConsistent) -> None) @@ -227,7 +227,7 @@ private[sbt] object Definition { override def run(): Unit = try { AnalysesAccess.cache.getIfPresent(AnalysesKey) match { - case null => result.success(Nil) + case null => result.success(Nil) case caches => val (working, uninitialized) = caches.partition { case (_, Some(_)) => true diff --git a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala index 6a37d351e..89deeca0c 100644 --- a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala +++ b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala @@ -361,7 +361,7 @@ final class NetworkChannel( def notifyEvent(event: EventMessage): Unit = { event match { - case entry: LogEvent => logMessage(entry.level, entry.message) + case entry: LogEvent => logMessage(entry.level, entry.message) case entry: ExecStatusEvent => getPendingRequest(entry.execId) match { case Some(request) => diff --git a/main/src/main/scala/sbt/internal/server/VirtualTerminal.scala b/main/src/main/scala/sbt/internal/server/VirtualTerminal.scala index b4850d4d0..21efe9d7d 100644 --- a/main/src/main/scala/sbt/internal/server/VirtualTerminal.scala +++ b/main/src/main/scala/sbt/internal/server/VirtualTerminal.scala @@ -199,7 +199,7 @@ object VirtualTerminal { Converter.fromJson[TerminalCapabilitiesResponse](_).toOption ) pendingTerminalCapabilities.remove((callback.name, r.id)) match { - case null => + case null => case buffer => buffer.put(response.getOrElse(TerminalCapabilitiesResponse(None, None, None))) } @@ -207,7 +207,7 @@ object VirtualTerminal { val response = r.result.flatMap(Converter.fromJson[TerminalAttributesResponse](_).toOption) pendingTerminalAttributes.remove((callback.name, r.id)) match { - case null => + case null => case buffer => buffer.put(response.getOrElse(TerminalAttributesResponse("", "", "", "", ""))) } diff --git a/main/src/main/scala/sbt/nio/FileStamp.scala b/main/src/main/scala/sbt/nio/FileStamp.scala index 8987cdf41..e06c0fd51 100644 --- a/main/src/main/scala/sbt/nio/FileStamp.scala +++ b/main/src/main/scala/sbt/nio/FileStamp.scala @@ -18,7 +18,7 @@ import sbt.io.IO import sbt.nio.file.FileAttributes import sbt.util.Digest import sjsonnew.{ Builder, JsonFormat, Unbuilder, deserializationError } -import xsbti.compile.analysis.{ Stamp as XStamp } +import xsbti.compile.analysis.Stamp as XStamp import xsbti.VirtualFileRef /** diff --git a/main/src/main/scala/sbt/nio/Watch.scala b/main/src/main/scala/sbt/nio/Watch.scala index 7ca36c4e5..7d6257f0e 100644 --- a/main/src/main/scala/sbt/nio/Watch.scala +++ b/main/src/main/scala/sbt/nio/Watch.scala @@ -77,8 +77,8 @@ object Watch { override def toString: String = s"$name($path)" } def fromIO(fileEvent: FileEvent[FileAttributes]): Watch.Event = fileEvent match { - case c @ FileEvent.Creation(p, _) => new Watch.Creation(p, c.occurredAt.value.finite) - case d @ FileEvent.Deletion(p, _) => new Watch.Deletion(p, d.occurredAt.value.finite) + case c @ FileEvent.Creation(p, _) => new Watch.Creation(p, c.occurredAt.value.finite) + case d @ FileEvent.Deletion(p, _) => new Watch.Deletion(p, d.occurredAt.value.finite) case u @ FileEvent.Update(p, _, _) => new Watch.Update(p, u.occurredAt.value.finite) } @@ -555,7 +555,7 @@ object Watch { .filterNot(c => watchPrefixes.exists(c.commandLine.trim.startsWith)) action match { case Run(commands) => state.copy(remainingCommands = commands ++ rc) - case Reload => + case Reload => state.copy(remainingCommands = "reload".toExec :: s"$prefix $count $command".toExec :: rc) case _: HandleError => state.copy(remainingCommands = rc).fail case _ => state.copy(remainingCommands = rc) diff --git a/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala b/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala index 4661f5fdb..e96d0b605 100644 --- a/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala +++ b/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala @@ -240,7 +240,7 @@ OPTIONS val modules = versionFilter match { case Some(version) => GraphModuleId(org, name, version) :: Nil - case None => + case None => graph.nodes.withFilter(m => m.id.organization == org && m.id.name == name).map(_.id) } val graphWidth = asciiGraphWidth.value @@ -384,7 +384,7 @@ OPTIONS def crossName(ivyModule: IvySbt#Module) = ivyModule.moduleSettings match { case ic: ModuleDescriptorConfiguration => ic.module.name - case _ => + case _ => throw new IllegalStateException( "sbt-dependency-graph plugin currently only supports ModuleDescriptorConfiguration of ivy settings (the default in sbt)" ) diff --git a/main/src/test/scala/Delegates.scala b/main/src/test/scala/Delegates.scala index acd15dde2..2da2a4c96 100644 --- a/main/src/test/scala/Delegates.scala +++ b/main/src/test/scala/Delegates.scala @@ -86,7 +86,7 @@ object Delegates extends Properties { keysGen.forAll.map { keys => allDelegates(keys) { (key, ds) => key.project match { - case Zero => success // filtering out of testing + case Zero => success // filtering out of testing case Select(rr: ResolvedReference) => rr match { case BuildRef(_) => @@ -114,7 +114,7 @@ object Delegates extends Properties { keysGen.forAll.map { keys => allDelegates(keys) { (key, ds) => key.config match { - case Zero => success + case Zero => success case Select(config) => key.project match { case Select(p @ ProjectRef(_, _)) => @@ -168,7 +168,7 @@ object Delegates extends Properties { def loop(cur: Scope, acc: List[Scope], rem: List[Seq[Scope => Scope]]): Seq[Scope] = rem match { - case Nil => acc + case Nil => acc case x :: xs => x flatMap { mod => val s = mod(cur) diff --git a/main/src/test/scala/ParseKeySpec.scala b/main/src/test/scala/ParseKeySpec.scala index 1c6864201..249803c59 100644 --- a/main/src/test/scala/ParseKeySpec.scala +++ b/main/src/test/scala/ParseKeySpec.scala @@ -130,10 +130,11 @@ object ParseKeySpec extends Properties { structure <- arbStructure // NOTE: Generating this after the structure improves shrinking mask <- maskGen - key <- for { - scope <- TestBuild.scope(structure.env) - key <- oneOf(structure.allAttributeKeys.toSeq) - } yield ScopedKey(scope, key) + key <- + for { + scope <- TestBuild.scope(structure.env) + key <- oneOf(structure.allAttributeKeys.toSeq) + } yield ScopedKey(scope, key) skm = StructureKeyMask(structure, key, mask) } yield skm) .filter(configExistsInIndex) diff --git a/main/src/test/scala/sbt/internal/TestBuild.scala b/main/src/test/scala/sbt/internal/TestBuild.scala index 8389d950e..549ce4e33 100644 --- a/main/src/test/scala/sbt/internal/TestBuild.scala +++ b/main/src/test/scala/sbt/internal/TestBuild.scala @@ -372,7 +372,7 @@ abstract class TestBuild { acc: Vector[Gen[(T, Vector[T])]] ): Gen[Vector[(T, Vector[T])]] = names match { - case Vector() => sequence(acc.toList).map(_.toVector) + case Vector() => sequence(acc.toList).map(_.toVector) case Vector(x, xs*) => val next = for (depCount <- Gen.int(maxDeps); d <- pick(depCount, xs)) diff --git a/project/SbtLauncherPlugin.scala b/project/SbtLauncherPlugin.scala index d073b2714..2fa51282d 100644 --- a/project/SbtLauncherPlugin.scala +++ b/project/SbtLauncherPlugin.scala @@ -19,7 +19,7 @@ object SbtLauncherPlugin extends AutoPlugin { rawSbtLaunchJar := { Classpaths.managedJars(SbtLaunchConfiguration, Set("jar"), update.value).headOption match { case Some(jar) => jar.data - case None => + case None => sys.error( s"Could not resolve sbt launcher!, dependencies := ${libraryDependencies.value}" ) diff --git a/project/Scripted.scala b/project/Scripted.scala index 752837422..23e93e248 100644 --- a/project/Scripted.scala +++ b/project/Scripted.scala @@ -37,7 +37,7 @@ object Scripted { if (scala.util.Properties.isWin) new SimpleFileFilter(f => (f.getParentFile.getName, f.getName) match { - case ("classloader-cache", "jni") => true // no native lib is built for windows + case ("classloader-cache", "jni") => true // no native lib is built for windows case ("classloader-cache", "spark") => true // the test spark server is unable to bind to a local socket on Visual Studio 2019 case ("nio", "make-clone") => true // uses gcc which isn't set up on all systems diff --git a/run/src/main/scala/sbt/Fork.scala b/run/src/main/scala/sbt/Fork.scala index 935f3fc91..1bb934f29 100644 --- a/run/src/main/scala/sbt/Fork.scala +++ b/run/src/main/scala/sbt/Fork.scala @@ -148,7 +148,7 @@ object Fork { private def booleanOpt(name: String): Option[Boolean] = sys.props.get(name) match { case Some(x) => parseBoolean(x) - case _ => + case _ => sys.env.get(name.toUpperCase(Locale.ENGLISH).replace('.', '_')) match { case Some(x) => parseBoolean(x) case _ => None @@ -202,7 +202,7 @@ object Fork { } val process = Process(jpb) outputStrategy.getOrElse(StdoutOutput: OutputStrategy) match - case StdoutOutput => process.run(connectInput = false) + case StdoutOutput => process.run(connectInput = false) case out: BufferedOutput => out.logger.buffer { process.run(out.logger, connectInput = false) } case out: LoggedOutput => process.run(out.logger, connectInput = false) diff --git a/run/src/main/scala/sbt/Run.scala b/run/src/main/scala/sbt/Run.scala index 895b675ab..02ea8cd72 100644 --- a/run/src/main/scala/sbt/Run.scala +++ b/run/src/main/scala/sbt/Run.scala @@ -9,7 +9,7 @@ package sbt import java.io.File -import java.nio.file.{ Path as NioPath } +import java.nio.file.Path as NioPath import java.lang.reflect.Method import java.lang.reflect.Modifier.{ isPrivate, isPublic, isStatic } import sbt.internal.inc.ScalaInstance diff --git a/run/src/main/scala/sbt/SelectMainClass.scala b/run/src/main/scala/sbt/SelectMainClass.scala index 68aea5049..459ff247b 100644 --- a/run/src/main/scala/sbt/SelectMainClass.scala +++ b/run/src/main/scala/sbt/SelectMainClass.scala @@ -21,7 +21,7 @@ object SelectMainClass { mainClasses.toList match { case Nil => None case head :: Nil => Some(head) - case multiple => + case multiple => promptIfMultipleChoices.flatMap { prompt => @tailrec def loop(): Option[String] = { val header = "\nMultiple main classes detected. Select one to run:\n" diff --git a/sbt-app/src/main/scala/package.scala b/sbt-app/src/main/scala/package.scala index 714708ccd..7693b078c 100644 --- a/sbt-app/src/main/scala/package.scala +++ b/sbt-app/src/main/scala/package.scala @@ -8,7 +8,7 @@ import sbt.nio.FileStamp import sjsonnew.JsonFormat -import java.nio.file.{ Path as NioPath } +import java.nio.file.Path as NioPath import sbt.librarymanagement.{ Configuration, ConfigurationMacro } import scala.language.experimental.macros diff --git a/sbt-app/src/test/scala/sbt/RunFromSourceMain.scala b/sbt-app/src/test/scala/sbt/RunFromSourceMain.scala index c7917f63a..5ab46d6bf 100644 --- a/sbt-app/src/test/scala/sbt/RunFromSourceMain.scala +++ b/sbt-app/src/test/scala/sbt/RunFromSourceMain.scala @@ -97,7 +97,7 @@ object RunFromSourceMain { context ) map exit catch { - case r: xsbti.FullReload => Some((baseDir, r.arguments.toSeq)) + case r: xsbti.FullReload => Some((baseDir, r.arguments.toSeq)) case scala.util.control.NonFatal(e) => e.printStackTrace(); errorAndExit(e.toString) } @@ -157,7 +157,7 @@ object RunFromSourceMain { val BinPre = """(.*)(?:\-[\d.]+)-(?:bin|pre)-.*\.jar""".r val module = "org.scala-lang" % "scala3-compiler_3" % scalaVersion lm.retrieve(module, scalaModuleInfo = None, scalaHome1Temp, log) match { - case Left(w) => throw w.resolveException + case Left(w) => throw w.resolveException case Right(_) => val jars = (scalaHome1Temp ** "*.jar").get() assert(jars.nonEmpty, s"no jars for scala $scalaVersion") diff --git a/sbtw/src/main/scala/sbtw/ConfigLoader.scala b/sbtw/src/main/scala/sbtw/ConfigLoader.scala index d67b6213e..40835db35 100644 --- a/sbtw/src/main/scala/sbtw/ConfigLoader.scala +++ b/sbtw/src/main/scala/sbtw/ConfigLoader.scala @@ -13,8 +13,7 @@ object ConfigLoader: Using.resource(Source.fromFile(file))(_.getLines().toList.flatMap: line => val trimmed = line.trim if trimmed.isEmpty || trimmed.startsWith("#") then Nil - else Seq(trimmed) - ) + else Seq(trimmed)) catch { case _: Exception => Nil } def loadSbtOpts(cwd: File, sbtHome: File): Seq[String] = diff --git a/sbtw/src/main/scala/sbtw/Main.scala b/sbtw/src/main/scala/sbtw/Main.scala index e33cde483..199caf035 100644 --- a/sbtw/src/main/scala/sbtw/Main.scala +++ b/sbtw/src/main/scala/sbtw/Main.scala @@ -20,7 +20,7 @@ object Main: val allArgs = fileArgs ++ args ArgParser.parse(allArgs.toArray) match - case None => System.exit(1) + case None => System.exit(1) case Some(opts) => val exitCode = run(cwd, sbtHome, sbtBinDir, opts) System.exit(if exitCode == 0 then 0 else 1) diff --git a/scripted-sbt/src/main/scala/sbt/scriptedtest/SbtHandler.scala b/scripted-sbt/src/main/scala/sbt/scriptedtest/SbtHandler.scala index 0a55cd8fd..31e146de3 100644 --- a/scripted-sbt/src/main/scala/sbt/scriptedtest/SbtHandler.scala +++ b/scripted-sbt/src/main/scala/sbt/scriptedtest/SbtHandler.scala @@ -58,7 +58,7 @@ final class SbtHandler(remoteSbtCreator: RemoteSbtCreator) extends StatementHand } def finish(state: State) = state match { - case None => + case None => case Some(SbtInstance(process, server)) => try { send("exit", server) diff --git a/server-test/src/test/scala/testpkg/ChannelCursorTest.scala b/server-test/src/test/scala/testpkg/ChannelCursorTest.scala index 07c67956b..23d555edd 100644 --- a/server-test/src/test/scala/testpkg/ChannelCursorTest.scala +++ b/server-test/src/test/scala/testpkg/ChannelCursorTest.scala @@ -30,7 +30,7 @@ class ChannelCursorTest extends AbstractServerTest { catch { case _: IOException if attempt < 10 => None } res match { case Some(s) => s - case _ => + case _ => Thread.sleep(100) connect(attempt + 1) } diff --git a/server-test/src/test/scala/testpkg/TestServer.scala b/server-test/src/test/scala/testpkg/TestServer.scala index 0235f73ed..5ae2e2534 100644 --- a/server-test/src/test/scala/testpkg/TestServer.scala +++ b/server-test/src/test/scala/testpkg/TestServer.scala @@ -211,7 +211,7 @@ case class TestServer( catch { case _: IOException if attempt < 10 => None } res match { case Some(s) => s - case _ => + case _ => Thread.sleep(100) connect(attempt + 1) } diff --git a/tasks-standard/src/main/scala/sbt/std/Streams.scala b/tasks-standard/src/main/scala/sbt/std/Streams.scala index 465b91ee9..9d33c7dad 100644 --- a/tasks-standard/src/main/scala/sbt/std/Streams.scala +++ b/tasks-standard/src/main/scala/sbt/std/Streams.scala @@ -109,7 +109,7 @@ object Streams { synchronized { streams.get(key) match { case Some(s) if !s.isClosed => s - case _ => + case _ => val newS = delegate(key) streams.put(key, newS) newS diff --git a/tasks-standard/src/main/scala/sbt/std/TaskExtra.scala b/tasks-standard/src/main/scala/sbt/std/TaskExtra.scala index ceffdedb4..86946e50e 100644 --- a/tasks-standard/src/main/scala/sbt/std/TaskExtra.scala +++ b/tasks-standard/src/main/scala/sbt/std/TaskExtra.scala @@ -263,7 +263,7 @@ object TaskExtra extends TaskExtra { case Seq() => sys.error("Cannot reduce empty sequence") case Seq(x) => x case Seq(x, y) => reducePair(x, y, f) - case _ => + case _ => val (a, b) = i.splitAt(i.size / 2) reducePair(reduced(a, f), reduced(b, f), f) } diff --git a/tasks-standard/src/test/scala/Test.scala b/tasks-standard/src/test/scala/Test.scala index 7f916bcb8..b027053be 100644 --- a/tasks-standard/src/test/scala/Test.scala +++ b/tasks-standard/src/test/scala/Test.scala @@ -26,7 +26,7 @@ object Test extends std.TaskExtra: val f: Values => Any = { case (Result.Value(aa), Result.Value(bb), Result.Value(cc)) => s"$aa $bb $cc" - case x => + case x => val cs = x.productIterator.toList.collect { case Result.Inc(x) => x } // workaround for double definition bug diff --git a/tasks/src/main/scala/sbt/Execute.scala b/tasks/src/main/scala/sbt/Execute.scala index 358a3d05a..250fa79c5 100644 --- a/tasks/src/main/scala/sbt/Execute.scala +++ b/tasks/src/main/scala/sbt/Execute.scala @@ -144,7 +144,7 @@ private[sbt] final class Execute( results.get(target) match { case Some(result) => retire(node, result) - case None => + case None => state(node) = Calling addChecked(target) addCaller(node, target) diff --git a/tasks/src/main/scala/sbt/Incomplete.scala b/tasks/src/main/scala/sbt/Incomplete.scala index 3899680b1..8273f205d 100644 --- a/tasks/src/main/scala/sbt/Incomplete.scala +++ b/tasks/src/main/scala/sbt/Incomplete.scala @@ -11,7 +11,7 @@ package sbt import scala.collection.mutable.ListBuffer import sbt.internal.util.IDSet -import Incomplete.{ Value as IValue } +import Incomplete.Value as IValue import scala.jdk.CollectionConverters.* /** diff --git a/testing/src/main/scala/sbt/TestFramework.scala b/testing/src/main/scala/sbt/TestFramework.scala index 9d208cfe2..364fbe880 100644 --- a/testing/src/main/scala/sbt/TestFramework.scala +++ b/testing/src/main/scala/sbt/TestFramework.scala @@ -12,7 +12,7 @@ import java.util.concurrent.CopyOnWriteArrayList import scala.jdk.CollectionConverters.* import scala.util.control.NonFatal import testing.{ Task as TestTask, * } -import org.scalatools.testing.{ Framework as OldFramework } +import org.scalatools.testing.Framework as OldFramework import scala.annotation.tailrec import sbt.internal.util.ManagedLogger import sbt.protocol.testing.TestResult @@ -69,7 +69,7 @@ final class TestFramework(val implClassNames: String*) extends Serializable { case head :: tail => try { Some(Class.forName(head, true, loader).getDeclaredConstructor().newInstance() match { - case newFramework: Framework => newFramework + case newFramework: Framework => newFramework case oldFramework: OldFramework => new sbt.internal.worker1.FrameworkWrapper(oldFramework) }) diff --git a/testing/src/main/scala/sbt/internal/testing/TestLogger.scala b/testing/src/main/scala/sbt/internal/testing/TestLogger.scala index 86764eb9a..2b67ee54d 100644 --- a/testing/src/main/scala/sbt/internal/testing/TestLogger.scala +++ b/testing/src/main/scala/sbt/internal/testing/TestLogger.scala @@ -9,7 +9,7 @@ package sbt package internal.testing -import testing.{ Logger as TLogger } +import testing.Logger as TLogger import sbt.internal.util.{ BufferedAppender, ManagedLogger, Terminal } import sbt.util.{ Level, ShowLines } import sbt.protocol.testing.* diff --git a/util-cache/src/main/scala/sbt/util/ActionCacheStore.scala b/util-cache/src/main/scala/sbt/util/ActionCacheStore.scala index cb6c78e47..4b921d76b 100644 --- a/util-cache/src/main/scala/sbt/util/ActionCacheStore.scala +++ b/util-cache/src/main/scala/sbt/util/ActionCacheStore.scala @@ -268,7 +268,7 @@ case class DiskActionCacheStore(base: Path, converter: FileConverter) if isCompleteBlob(casFile, Digest(r)) then r match case p: PathBasedFile => Some(p) - case _ => + case _ => val content = IO.read(casFile.toFile()) Some(StringVirtualFile1(r.id, content)) else None @@ -381,7 +381,7 @@ case class DiskActionCacheStore(base: Path, converter: FileConverter) currentItem match case p if !Files.exists(p) => doSync(ref, tempPath) case p if Digest.sameDigest(p, d) => () - case p => + case p => IO.delete(p.toFile()) doSync(ref, tempPath) // sync deleted files diff --git a/util-cache/src/main/scala/sbt/util/CacheImplicits.scala b/util-cache/src/main/scala/sbt/util/CacheImplicits.scala index b57b64a42..c4196a272 100644 --- a/util-cache/src/main/scala/sbt/util/CacheImplicits.scala +++ b/util-cache/src/main/scala/sbt/util/CacheImplicits.scala @@ -72,7 +72,7 @@ trait CacheImplicits extends BasicCacheImplicits with BasicJsonProtocol: ) = Option(stampCache.get().getIfPresent(ref.id())) match case Some((v, mod, i)) if lastModified == mod && sizeBytes == i => v - case _ => + case _ => val v = value stampCache.get().put(ref.id(), (v, lastModified, sizeBytes)) v @@ -82,7 +82,7 @@ trait CacheImplicits extends BasicCacheImplicits with BasicJsonProtocol: ) = Option(digestCache.get().getIfPresent(ref.id())) match case Some((v, mod, i)) if lastModified == mod && sizeBytes == i => v - case _ => + case _ => val v = value digestCache.get().put(ref.id(), (v, lastModified, sizeBytes)) v diff --git a/util-collection/src/main/scala/sbt/internal/util/Dag.scala b/util-collection/src/main/scala/sbt/internal/util/Dag.scala index f7cfd2441..45524012b 100644 --- a/util-collection/src/main/scala/sbt/internal/util/Dag.scala +++ b/util-collection/src/main/scala/sbt/internal/util/Dag.scala @@ -124,7 +124,7 @@ object Dag { val visited = new mutable.HashSet[Node] def visit(edges: List[Arrow], stack: List[Arrow]): List[Arrow] = edges match { - case Nil => Nil + case Nil => Nil case edge :: tail => val node = head(edge) if (!visited(node)) { diff --git a/util-collection/src/main/scala/sbt/internal/util/INode.scala b/util-collection/src/main/scala/sbt/internal/util/INode.scala index e19893c0d..a56e772e6 100644 --- a/util-collection/src/main/scala/sbt/internal/util/INode.scala +++ b/util-collection/src/main/scala/sbt/internal/util/INode.scala @@ -42,13 +42,13 @@ class EvaluateSettings[I <: Init]( // TODO create a Single node with no transform? single(getStatic(k.scopedKey), identity) case u: Uniform[s, A] => UniformNode(u.inputs.map(transform[s]), u.f) - case a: Apply[k, A] => + case a: Apply[k, A] => MixedNode[k, A](TupleMapExtension.transform(a.inputs)(transform), a.f) case b: Bind[s, A] => BindNode[s, A](transform(b.in), x => transform(b.f(x))) case v: Value[A] => constant(v.value) case v: ValidationCapture[a] => strictConstant(v.key: A) case t: TransformCapture => strictConstant(t.f: A) - case o: Optional[s, A] => + case o: Optional[s, A] => o.a match case None => constant(() => o.f(None)) case Some(i) => single[s, A](transform(i), x => o.f(Some(x))) @@ -193,7 +193,7 @@ class EvaluateSettings[I <: Init]( registerIfNew() state match { case Evaluated => submitCallComplete(by, value) - case _ => + case _ => calledBy += by () } diff --git a/util-tracking/src/main/scala/sbt/util/Tracked.scala b/util-tracking/src/main/scala/sbt/util/Tracked.scala index f5390fa7b..a66b36360 100644 --- a/util-tracking/src/main/scala/sbt/util/Tracked.scala +++ b/util-tracking/src/main/scala/sbt/util/Tracked.scala @@ -286,7 +286,7 @@ object Tracked { def save(store: CacheStore, value: I): Unit = { Hasher.hash(value) match { case USuccess(keyHash) => store.write[Long](keyHash.toLong) - case Failure(e) => + case Failure(e) => if (isStrictMode) throw e else () } @@ -297,12 +297,12 @@ object Tracked { case USuccess(prev: Long) => Hasher.hash(value) match { case USuccess(keyHash: Int) => keyHash.toLong != prev - case Failure(e) => + case Failure(e) => if (isStrictMode) throw e else true } case Failure(_: EmptyCacheError) => true - case Failure(e) => + case Failure(e) => if (isStrictMode) throw e else true } diff --git a/zinc-lm-integration/src/main/scala/sbt/internal/inc/ZincComponentCompiler.scala b/zinc-lm-integration/src/main/scala/sbt/internal/inc/ZincComponentCompiler.scala index a9935877f..9ea5d12e8 100644 --- a/zinc-lm-integration/src/main/scala/sbt/internal/inc/ZincComponentCompiler.scala +++ b/zinc-lm-integration/src/main/scala/sbt/internal/inc/ZincComponentCompiler.scala @@ -16,7 +16,7 @@ import sbt.internal.util.{ BufferedLogger, FullLogger } import sbt.io.IO import sbt.librarymanagement.* import sbt.librarymanagement.syntax.* -import sbt.util.InterfaceUtil.{ toSupplier as f0 } +import sbt.util.InterfaceUtil.toSupplier as f0 import xsbti.ArtifactInfo.* import xsbti.compile.{ ClasspathOptionsUtil, diff --git a/zinc-lm-integration/src/main/scala/sbt/internal/inc/ZincComponentManager.scala b/zinc-lm-integration/src/main/scala/sbt/internal/inc/ZincComponentManager.scala index 464dba10e..33db7c98e 100644 --- a/zinc-lm-integration/src/main/scala/sbt/internal/inc/ZincComponentManager.scala +++ b/zinc-lm-integration/src/main/scala/sbt/internal/inc/ZincComponentManager.scala @@ -47,7 +47,7 @@ class ZincComponentManager( def createAndCache = { ifMissing match { - case IfMissing.Fail => notFound + case IfMissing.Fail => notFound case d: IfMissing.Define => d.run() // this is expected to have called define. if (d.useSecondaryCache) {