From 00d01ce215a554892794f3946dbc14199bf9e40b Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Tue, 22 Oct 2024 19:57:10 +0900 Subject: [PATCH] Update scalafmt --- .scalafmt.conf | 2 +- .../internal/ResolutionParams.scala | 47 +++++++++---------- main/src/main/scala/sbt/Defaults.scala | 2 +- main/src/main/scala/sbt/internal/Act.scala | 16 +++---- .../scala/sbt/JUnitXmlTestsListener.scala | 11 +++-- 5 files changed, 40 insertions(+), 38 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index ff4775593..839c8a293 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.7.14 +version = 3.8.3 runner.dialect = scala3 maxColumn = 100 diff --git a/lm-coursier/src/main/scala/lmcoursier/internal/ResolutionParams.scala b/lm-coursier/src/main/scala/lmcoursier/internal/ResolutionParams.scala index 2dc9e7bae..64cd965eb 100644 --- a/lm-coursier/src/main/scala/lmcoursier/internal/ResolutionParams.scala +++ b/lm-coursier/src/main/scala/lmcoursier/internal/ResolutionParams.scala @@ -79,31 +79,30 @@ final case class ResolutionParams( ) } - override lazy val hashCode = - this match { - case ResolutionParams( - a1, - a2, - a3, - a4, - a5, - a6, - a7, - a8, - a9, - a10, - a11, - a12, - a13, - a14, - a15, - a16, - a17 - ) => - (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17).## - } + override lazy val hashCode = this match { + case ResolutionParams( + a1, + a2, + a3, + a4, + a5, + a6, + a7, + a8, + a9, + a10, + a11, + a12, + a13, + a14, + a15, + a16, + a17 + ) => + (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17).## + } - // ResolutionParams.unapply(this).get.## + // ResolutionParams.unapply(this).get.## } diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index f1f36a9c1..c337876df 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -3923,7 +3923,7 @@ object Classpaths { val pluginClasspath = unit.plugins.fullClasspath.toVector val pluginJars = pluginClasspath.filter: x => !Files.isDirectory(converter.toPath(x.data)) - // exclude directories: an approximation to whether they've been published + // exclude directories: an approximation to whether they've been published val pluginIDs: Vector[ModuleID] = pluginJars.flatMap(_.get(moduleIDStr).map: str => moduleIdJsonKeyFormat.read(str)) GetClassifiersModule( diff --git a/main/src/main/scala/sbt/internal/Act.scala b/main/src/main/scala/sbt/internal/Act.scala index c71029432..bd4fa0dd6 100644 --- a/main/src/main/scala/sbt/internal/Act.scala +++ b/main/src/main/scala/sbt/internal/Act.scala @@ -73,15 +73,15 @@ object Act { structure: BuildStructure ): KeysParser = for ( - selected <- scopedKeySelected( - structure.index.aggregateKeyIndex, - current, - defaultConfigs, - structure.index.keyMap, - structure.data, - askProject = true, + selected <- scopedKeySelected( + structure.index.aggregateKeyIndex, + current, + defaultConfigs, + structure.index.keyMap, + structure.data, + askProject = true, + ) ) - ) yield Aggregation.aggregate( selected.key.asInstanceOf[ScopedKey[Any]], selected.mask, diff --git a/testing/src/main/scala/sbt/JUnitXmlTestsListener.scala b/testing/src/main/scala/sbt/JUnitXmlTestsListener.scala index fe6fb51f5..67e54d57e 100644 --- a/testing/src/main/scala/sbt/JUnitXmlTestsListener.scala +++ b/testing/src/main/scala/sbt/JUnitXmlTestsListener.scala @@ -153,14 +153,17 @@ class JUnitXmlTestsListener(val targetDir: File, legacyTestReport: Boolean, logg {trace} - case TStatus.Error => + case TStatus.Error => + case TStatus.Failure if (e.throwable.isDefined) => {trace} - case TStatus.Failure => - case TStatus.Ignored | TStatus.Skipped | TStatus.Pending => - case _ => {} + case TStatus.Failure => + + case TStatus.Ignored | TStatus.Skipped | TStatus.Pending => + + case _ => {} } }