From 9eba9010221370c8cd45b1113933774eb6d676f8 Mon Sep 17 00:00:00 2001
From: Albert Meltzer <7529386+kitbellew@users.noreply.github.com>
Date: Fri, 27 Dec 2024 12:03:55 -0800
Subject: [PATCH] Formatting: upgrade to v3.8.4-RC4

---
 .scalafmt.conf                                     |  2 +-
 .../scala/org/scalafmt/config/ScalafmtConfig.scala |  5 +++--
 .../scala/org/scalafmt/internal/FormatTokens.scala |  5 +++--
 .../main/scala/org/scalafmt/internal/State.scala   | 14 +++++++-------
 .../org/scalafmt/rewrite/RedundantBraces.scala     |  6 +++---
 .../src/main/scala/org/scalafmt/util/TreeOps.scala |  5 +++--
 6 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/.scalafmt.conf b/.scalafmt.conf
index c25f615e0d..fdbea71aa1 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version=3.8.4-RC3
+version=3.8.4-RC4
 runner.dialect = scala213
 project {
   git = true
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
index dd0d4bda90..96fdb30599 100644
--- a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfig.scala
+++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfig.scala
@@ -130,8 +130,9 @@ 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))
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatTokens.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatTokens.scala
index d18cac2d6a..dd8d165fc3 100644
--- a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatTokens.scala
+++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatTokens.scala
@@ -104,8 +104,9 @@ class FormatTokens(leftTok2tok: Map[TokenHash, Int])(val arr: Array[FT])
     getHeadAndLastIfEnclosed(tree.tokens, tree)
 
   def getDelimsIfEnclosed(tokens: Tokens, tree: Tree): Option[(FT, FT)] =
-    getHeadAndLastIfEnclosed(tokens, tree)
-      .flatMap { case (head, lastOpt) => lastOpt.map(last => (head, last)) }
+    getHeadAndLastIfEnclosed(tokens, tree).flatMap { case (head, lastOpt) =>
+      lastOpt.map(last => (head, last))
+    }
   def getDelimsIfEnclosed(tree: Tree): Option[(FT, FT)] =
     getDelimsIfEnclosed(tree.tokens, tree)
 
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/State.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/State.scala
index 9a2f79a922..94e9e68fb6 100644
--- a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/State.scala
+++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/State.scala
@@ -272,15 +272,15 @@ final class State(
   ): Option[FT] = getLineStartOwner(isComment)
     .flatMap { case (lineFt, lineOwner) =>
       val ft = tokens(depth)
-      val ok = {
+      val ok =
         // comment could be preceded by a comma
         isComment && ft.left.is[T.Comma] &&
-        (tokens.prev(ft).meta.leftOwner match {
-          case `lineOwner` => true
-          case t: Member.SyntaxValuesClause => t.parent.contains(lineOwner)
-          case _ => false
-        })
-      } || findTreeOrParentSimple(ft.meta.leftOwner)(_ eq lineOwner).isDefined
+          (tokens.prev(ft).meta.leftOwner match {
+            case `lineOwner` => true
+            case t: Member.SyntaxValuesClause => t.parent.contains(lineOwner)
+            case _ => false
+          }) || findTreeOrParentSimple(ft.meta.leftOwner)(_ eq lineOwner)
+            .isDefined
       if (ok) Some(lineFt) else None
     }
 
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/RedundantBraces.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/RedundantBraces.scala
index e8b74c6ba6..3c78eb1a66 100644
--- a/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/RedundantBraces.scala
+++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/RedundantBraces.scala
@@ -376,9 +376,9 @@ class RedundantBraces(implicit val ftoks: FormatTokens)
             }
             else null
           case Some(f: Term.FunctionTerm)
-              if getBlockToReplaceAsFuncBodyIfInSingleArgApply(f)
-                .exists { case (_, xft) => xft.idx <= ft.idx + 1 } =>
-            removeToken
+              if getBlockToReplaceAsFuncBodyIfInSingleArgApply(f).exists {
+                case (_, xft) => xft.idx <= ft.idx + 1
+              } => removeToken
           case Some(_: Term.Interpolate) => handleInterpolation
           case Some(_: Term.Xml) => null
           case Some(_: Term.Annotate) => null
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/util/TreeOps.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/util/TreeOps.scala
index 960a2fe3cc..40610ca1e1 100644
--- a/scalafmt-core/shared/src/main/scala/org/scalafmt/util/TreeOps.scala
+++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/util/TreeOps.scala
@@ -49,8 +49,9 @@ object TreeOps {
     private def getBraces[A](tree: Tree, values: List[A])(implicit
         ftoks: FormatTokens,
     ): Option[(FT, A, FT)] = values match {
-      case arg :: Nil => ftoks.getBracesIfEnclosed(tree)
-          .map { case (b, e) => (b, arg, e) }
+      case arg :: Nil => ftoks.getBracesIfEnclosed(tree).map { case (b, e) =>
+          (b, arg, e)
+        }
       case _ => None
     }