Formatting: update version to v3.8.4-RC3

scalameta · Nov 27, 2024 · 5e76cc2 · 5e76cc2
1 parent 4aeb6de
commit 5e76cc2
Show file tree

Hide file tree

Showing 54 changed files with 765 additions and 777 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version=3.8.2
+version=3.8.4-RC3
 runner.dialect = scala213
 project {
   git = true

diff --git a/build.sbt b/build.sbt
@@ -253,19 +253,18 @@ lazy val communityTestsScala3 = project
   .in(file("scalafmt-tests-community/scala3")).settings(communityTestsSettings)
   .enablePlugins(BuildInfoPlugin).dependsOn(communityTestsCommon)
 
-lazy val communityTestsSpark = project
-  .in(file("scalafmt-tests-community/spark")).settings(communityTestsSettings)
-  .enablePlugins(BuildInfoPlugin).dependsOn(communityTestsCommon)
-
-lazy val communityTestsIntellij = project
-  .in(file("scalafmt-tests-community/intellij"))
+lazy val communityTestsSpark = project.in(file("scalafmt-tests-community/spark"))
   .settings(communityTestsSettings).enablePlugins(BuildInfoPlugin)
   .dependsOn(communityTestsCommon)
 
-lazy val communityTestsOther = project
-  .in(file("scalafmt-tests-community/other")).settings(communityTestsSettings)
+lazy val communityTestsIntellij = project
+  .in(file("scalafmt-tests-community/intellij")).settings(communityTestsSettings)
   .enablePlugins(BuildInfoPlugin).dependsOn(communityTestsCommon)
 
+lazy val communityTestsOther = project.in(file("scalafmt-tests-community/other"))
+  .settings(communityTestsSettings).enablePlugins(BuildInfoPlugin)
+  .dependsOn(communityTestsCommon)
+
 lazy val benchmarks = project.in(file("scalafmt-benchmarks")).settings(
   publish / skip := true,
   moduleName := "scalafmt-benchmarks",

diff --git a/readme/src/main/scala/org/scalafmt/readme/Readme.scala b/readme/src/main/scala/org/scalafmt/readme/Readme.scala
@@ -57,8 +57,9 @@ object Readme {
     val expressions = s"{$code}".parse[Stat].get.asInstanceOf[Term.Block].stats
     val evaluated = eval[Any](code)
     val output = evaluated match {
-      case s: String => s"""|
-                            |"$s"""".stripMargin
+      case s: String =>
+        s"""|
+            |"$s"""".stripMargin
       case x => x.toString
     }
     val result = s"""|${expressions.map(x => s"scala> ${x.toString().trim}")
@@ -142,8 +143,8 @@ object Readme {
   }
 
   def demoStyle(style: ScalafmtConfig)(code: String): TypedTag[String] = {
-    val formatted = Scalafmt
-      .format(code, style.copy(runner = ScalafmtRunner.sbt)).get
+    val formatted = Scalafmt.format(code, style.copy(runner = ScalafmtRunner.sbt))
+      .get
     div(sideBySide(code, formatted), configurationBlock(style))
   }
 

diff --git a/scalafmt-cli/jvm/src/main/scala/org/scalafmt/cli/CliUtils.scala b/scalafmt-cli/jvm/src/main/scala/org/scalafmt/cli/CliUtils.scala
@@ -8,14 +8,14 @@ private[scalafmt] trait CliUtils {
   protected val isScalaNative: Boolean = false
 
   def nailMain(nGContext: NGContext): Unit = {
-    val workingDirectory = AbsoluteFile.fromPathIfAbsolute(
-      nGContext.getWorkingDirectory,
-    ).getOrElse {
-      throw new IllegalStateException(
-        s"Expected absolute path, " +
-          s"obtained nGContext.getWorkingDirectory = ${nGContext.getWorkingDirectory}",
-      )
-    }
+    val workingDirectory = AbsoluteFile
+      .fromPathIfAbsolute(nGContext.getWorkingDirectory).getOrElse {
+        throw new IllegalStateException(
+          s"Expected absolute path, " +
+            s"obtained nGContext.getWorkingDirectory = ${nGContext
+                .getWorkingDirectory}",
+        )
+      }
     val exit = Cli.mainWithOptions(
       nGContext.getArgs,
       CliOptions.default.copy(common =

diff --git a/scalafmt-cli/shared/src/main/scala/org/scalafmt/cli/CliArgParser.scala b/scalafmt-cli/shared/src/main/scala/org/scalafmt/cli/CliArgParser.scala
@@ -105,8 +105,8 @@ object CliArgParser {
             |${FileFetchMode.help}
             |""".stripMargin,
       )
-      opt[Unit]("diff")
-        .action((_, c) => c.copy(mode = Option(DiffFiles("master")))).text(
+      opt[Unit]("diff").action((_, c) => c.copy(mode = Option(DiffFiles("master"))))
+        .text(
           s"""|Format files listed in `git diff` against master.
               |Deprecated: use --mode diff instead""".stripMargin,
         )

diff --git a/scalafmt-cli/shared/src/main/scala/org/scalafmt/cli/CliOptions.scala b/scalafmt-cli/shared/src/main/scala/org/scalafmt/cli/CliOptions.scala
@@ -146,9 +146,10 @@ case class CliOptions(
 
   private[cli] lazy val hoconOpt: Option[ConfParsed] = configStr
     .map(ConfParsed.fromString(_)).orElse {
-      canonicalConfigFile.map(
-        _.fold(x => new ConfParsed(Configured.exception(x)), ConfParsed.fromPath(_)),
-      )
+      canonicalConfigFile.map(_.fold(
+        x => new ConfParsed(Configured.exception(x)),
+        ConfParsed.fromPath(_),
+      ))
     }
 
   lazy val fileFetchMode: FileFetchMode = mode

diff --git a/scalafmt-cli/shared/src/main/scala/org/scalafmt/cli/TermDisplay.scala b/scalafmt-cli/shared/src/main/scala/org/scalafmt/cli/TermDisplay.scala
@@ -116,12 +116,14 @@ object TermDisplay extends TermUtils {
     def display(): String =
       if (isDone) (currentTimeOpt, remoteTimeOpt) match {
         case (Some(current), Some(remote)) =>
-          if (current < remote)
-            s"Updated since ${formatTimestamp(current)} (${formatTimestamp(remote)})"
+          if (current < remote) s"Updated since ${formatTimestamp(
+              current,
+            )} (${formatTimestamp(remote)})"
           else if (current == remote)
             s"No new update since ${formatTimestamp(current)}"
-          else
-            s"Warning: local copy newer than remote one (${formatTimestamp(current)} > ${formatTimestamp(remote)})"
+          else s"Warning: local copy newer than remote one (${formatTimestamp(
+              current,
+            )} > ${formatTimestamp(remote)})"
         case (Some(_), None) =>
           // FIXME Likely a 404 Not found, that should be taken into account by the cache
           "No modified time in response"

diff --git a/scalafmt-config/shared/src/main/scala/org/scalafmt/config/ConfParsed.scala b/scalafmt-config/shared/src/main/scala/org/scalafmt/config/ConfParsed.scala
@@ -34,9 +34,8 @@ class ConfParsed(val conf: Configured[Conf]) extends AnyVal {
     getHoconValueOpt[String]("onTestFailure")
 
   def encoding: Option[Either[String, Codec]] =
-    getHoconValueOpt[String]("encoding").map {
-      _.flatMap(x => Try(Codec(x)).toEither.left.map(_.getMessage))
-    }
+    getHoconValueOpt[String]("encoding")
+      .map(_.flatMap(x => Try(Codec(x)).toEither.left.map(_.getMessage)))
 
   def version: Option[Either[String, String]] =
     getHoconValueOpt[String]("version")

diff --git a/scalafmt-core/shared/src/main/scala-2.12/scala/collection/mutable/package.scala b/scalafmt-core/shared/src/main/scala-2.12/scala/collection/mutable/package.scala
@@ -3,9 +3,9 @@ package scala.collection
 package object mutable {
 
   implicit class ImplicitMap[K, V](private val obj: Map[K, V]) extends AnyVal {
-    def updateWith(key: K)(
-        remappingFunction: Option[V] => Option[V],
-    ): Option[V] = obj.get(key) match {
+    def updateWith(
+        key: K,
+    )(remappingFunction: Option[V] => Option[V]): Option[V] = obj.get(key) match {
       case vOldOpt @ Some(vOld) =>
         val vOpt = remappingFunction(vOldOpt)
         vOpt match {

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Docstrings.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Docstrings.scala
@@ -43,8 +43,8 @@ object Docstrings {
 
   implicit val surface: generic.Surface[Docstrings] = generic
     .deriveSurface[Docstrings]
-  implicit val codec: ConfCodecEx[Docstrings] = generic
-    .deriveCodecEx(Docstrings()).noTypos
+  implicit val codec: ConfCodecEx[Docstrings] = generic.deriveCodecEx(Docstrings())
+    .noTypos
 
   sealed abstract class Style {
     def skipFirstLine(v: Option[BlankFirstLine]): Option[BlankFirstLine]

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Indents.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Indents.scala
@@ -62,8 +62,8 @@ case class Indents(
 
 object Indents {
   implicit lazy val surface: generic.Surface[Indents] = generic.deriveSurface
-  implicit lazy val codec: ConfCodecEx[Indents] = generic
-    .deriveCodecEx(Indents()).noTypos
+  implicit lazy val codec: ConfCodecEx[Indents] = generic.deriveCodecEx(Indents())
+    .noTypos
 
   sealed abstract class RelativeToLhs
   object RelativeToLhs {

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfig.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfig.scala
@@ -156,9 +156,8 @@ case class ScalafmtConfig(
   import ScalafmtConfig._
 
   private[scalafmt] lazy val alignMap: Map[String, Seq[AlignToken.Matcher]] =
-    align.tokens.map(x => x.code -> x).toMap.map { case (k, v) =>
-      k -> v.getMatcher
-    }
+    align.tokens.map(x => x.code -> x).toMap
+      .map { case (k, v) => k -> v.getMatcher }
 
   private[scalafmt] def withDialect(dialect: NamedDialect): ScalafmtConfig =
     copy(runner = runner.withDialect(dialect))
@@ -218,9 +217,8 @@ case class ScalafmtConfig(
       val cfg = conf match {
         case x: Conf.Str => withDialect(NamedDialect.codec.read(None, x).get)
         case x =>
-          val styleOpt = eitherPat.left.toOption.flatMap { lang =>
-            project.layout.map(_.withLang(lang, this))
-          }
+          val styleOpt = eitherPat.left.toOption
+            .flatMap(lang => project.layout.map(_.withLang(lang, this)))
           decoder.read(styleOpt.orElse(Some(this)), x).get
       }
       eitherPat -> cfg
@@ -378,9 +376,8 @@ object ScalafmtConfig {
 
   private def readActiveStylePresets(conf: Conf): Configured[ScalafmtConfig] =
     (conf match {
-      case Conf.Str(x) => availableStyles.get(x.toLowerCase).map { style =>
-          Configured.ok(style)
-        }
+      case Conf.Str(x) => availableStyles.get(x.toLowerCase)
+          .map(style => Configured.ok(style))
       case _ => None
     }).getOrElse {
       val alternatives = activeStyles.keys.mkString(", ")
@@ -466,9 +463,8 @@ object ScalafmtConfig {
     (stateOpt, conf) => {
       val stylePreset = conf match {
         case x: Conf.Obj =>
-          val section = Seq(Presets.presetKey, "style").flatMap { y =>
-            x.field(y).map(y -> _)
-          }
+          val section = Seq(Presets.presetKey, "style")
+            .flatMap(y => x.field(y).map(y -> _))
           section.headOption.map { case (field, obj) =>
             obj -> Conf.Obj((x.map - field).toList)
           }

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtOptimizer.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtOptimizer.scala
@@ -52,8 +52,7 @@ case class ScalafmtOptimizer(
     pruneSlowStates: ScalafmtOptimizer.PruneSlowStates =
       ScalafmtOptimizer.PruneSlowStates.Yes,
     recurseOnBlocks: Boolean = true,
-    @annotation.ExtraName("forceConfigStyleOnOffset")
-    @annotation.DeprecatedName(
+    @annotation.ExtraName("forceConfigStyleOnOffset") @annotation.DeprecatedName(
       "forceConfigStyleMinSpan",
       "Use `callSite.minSpan` instead",
       "3.8.2",

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/BestFirstSearch.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/BestFirstSearch.scala
@@ -242,9 +242,8 @@ private class BestFirstSearch private (range: Set[Range])(implicit
     stats.trackState(state)
     val idx = state.depth
     val ft = tokens(idx)
-    val active = state.policy.execute(Decision(ft, routes(idx))).filter { s =>
-      s.isActive && pred(s)
-    }
+    val active = state.policy.execute(Decision(ft, routes(idx)))
+      .filter(s => s.isActive && pred(s))
     val splits =
       if (active.isEmpty || !ft.meta.formatOff && ft.inside(range)) active
       else {
@@ -259,9 +258,9 @@ private class BestFirstSearch private (range: Set[Range])(implicit
   }
 
   private def stateAsOptimal(state: State, splits: Seq[Split]) = {
-    val isOptimal = splits.exists { s =>
-      s.isNL && s.penalty < Constants.ShouldBeNewline
-    } || tokens.isRightCommentWithBreak(tokens(state.depth))
+    val isOptimal = splits
+      .exists(s => s.isNL && s.penalty < Constants.ShouldBeNewline) ||
+      tokens.isRightCommentWithBreak(tokens(state.depth))
     if (isOptimal) Some(state) else None
   }
 
@@ -301,15 +300,15 @@ private class BestFirstSearch private (range: Set[Range])(implicit
       val deepestYet = stats.deepestYet
       val nextSplits = routes(deepestYet.depth)
       val tok = tokens(deepestYet.depth)
-      val splitsAfterPolicy = deepestYet.policy
-        .execute(Decision(tok, nextSplits))
+      val splitsAfterPolicy = deepestYet.policy.execute(Decision(tok, nextSplits))
       def printSeq(vals: Seq[_]): String = vals.mkString("\n  ", "\n  ", "")
-      val msg = s"""|UNABLE TO FORMAT,
-                    |tok #${deepestYet.depth}/${tokens.length}: $tok
-                    |policies:${printSeq(deepestYet.policy.policies)}
-                    |splits (before policy):${printSeq(nextSplits)}
-                    |splits (after policy):${printSeq(splitsAfterPolicy)}
-                    |""".stripMargin
+      val msg =
+        s"""|UNABLE TO FORMAT,
+            |tok #${deepestYet.depth}/${tokens.length}: $tok
+            |policies:${printSeq(deepestYet.policy.policies)}
+            |splits (before policy):${printSeq(nextSplits)}
+            |splits (after policy):${printSeq(splitsAfterPolicy)}
+            |""".stripMargin
       if (initStyle.runner.debug) logger.debug(
         s"""|Failed to format
             |$msg""".stripMargin,
@@ -416,8 +415,7 @@ object BestFirstSearch {
     }
 
     private def updateBestImpl(state: State): Boolean = state.split.isNL &&
-      !state.hasSlb() &&
-      (best.getOrElseUpdate(state.prev.depth, state) eq state)
+      !state.hasSlb() && (best.getOrElseUpdate(state.prev.depth, state) eq state)
 
     def updateBest(state: State, furtherState: State)(implicit
         Q: StateQueue,
@@ -446,9 +444,8 @@ object BestFirstSearch {
     def retry: Option[StateStats] = {
       val ok = best.nonEmpty &&
         (pruneSlowStates eq ScalafmtOptimizer.PruneSlowStates.Yes)
-      if (ok) Some(
-        new StateStats(tokens, runner, ScalafmtOptimizer.PruneSlowStates.No),
-      )
+      if (ok)
+        Some(new StateStats(tokens, runner, ScalafmtOptimizer.PruneSlowStates.No))
       else None
     }
   }