Splits: handle braces within if/for/while better

Previously, we'd assume that a brace within `if` or `while` contains the
entire condition and let the brace rules handle it; however, this brace
could enclose only a part of the condition and hence needs to be handled
differently then.

Additionally, we ignored the danglingParentheses.ctrlSite parameter in
these cases as well.

Author: kitbellew

scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Splits.scala

@@ -1977,23 +1977,18 @@ object SplitsAfterLeftParen extends Splits {
   }
 
   private def get2(implicit ft: FT, fo: FormatOps, cfg: ScalafmtConfig) =
-    ft.right match {
+    getIfForWhile.getOrElse(ft.right match {
       case _: T.LeftBrace => Seq(Split(NoSplit, 0))
-      case _ => getIfForWhile.getOrElse(getRest)
-    }
+      case _ => getRest
+    })
 
   private def getIfForWhile(implicit
       ft: FT,
       fo: FormatOps,
       cfg: ScalafmtConfig,
   ) = {
     import fo._, tokens._, ft._
-    val ifForWhile = leftOwner match { // If/For/While/For with (
-      case t: Term.EnumeratorsBlock => getHeadOpt(t).contains(ft)
-      case _: Term.If | _: Term.While => !isTokenHeadOrBefore(left, leftOwner)
-      case _ => false
-    }
-    if (ifForWhile) Some {
+    def impl(enclosedInBraces: => Boolean) = Some {
       val close = matchingLeft(ft)
       val indentLen = cfg.indent.ctrlSite.getOrElse(cfg.indent.callSite)
       def indents =
@@ -2008,7 +2003,7 @@ object SplitsAfterLeftParen extends Splits {
           if (cfg.align.openParenCtrlSite) baseNoSplit().withIndents(indents)
             .withPolicy(penalizeNewlines)
             .andPolicy(decideNewlinesOnlyBeforeCloseOnBreak(close))
-          else baseNoSplit().withSingleLine(close)
+          else baseNoSplit().withSingleLine(close, ignore = enclosedInBraces)
         Seq(
           noSplit,
           Split(Newline, 1).withIndent(indentLen, close, Before)
@@ -2019,7 +2014,14 @@ object SplitsAfterLeftParen extends Splits {
         baseNoSplit(Newline).withIndents(indents).withPolicy(penalizeNewlines),
       )
     }
-    else None
+    def withCond(t: Tree.WithCond) =
+      if (isTokenHeadOrBefore(left, t)) None else impl(isEnclosedInBraces(t.cond))
+    leftOwner match { // If/For/While/For with (
+      case t: Term.EnumeratorsBlock if getHeadOpt(t).contains(ft) => impl(false)
+      case t: Term.If => withCond(t)
+      case t: Term.While => withCond(t)
+      case _ => None
+    }
   }
 
   private def getRest(implicit ft: FT, fo: FormatOps, cfg: ScalafmtConfig) = {

scalafmt-tests-community/intellij/shared/src/test/scala/org/scalafmt/community/intellij/CommunityIntellijScalaSuite.scala

@@ -13,7 +13,7 @@ abstract class CommunityIntellijScalaSuite(name: String)
 class CommunityIntellijScala_2024_2_Suite
     extends CommunityIntellijScalaSuite("intellij-scala-2024.2") {
 
-  override protected def totalStatesVisited: Option[Int] = Some(59395995)
+  override protected def totalStatesVisited: Option[Int] = Some(59396121)
 
   override protected def builds = Seq {
     getBuild(
@@ -54,7 +54,7 @@ class CommunityIntellijScala_2024_2_Suite
 class CommunityIntellijScala_2024_3_Suite
     extends CommunityIntellijScalaSuite("intellij-scala-2024.3") {
 
-  override protected def totalStatesVisited: Option[Int] = Some(59610714)
+  override protected def totalStatesVisited: Option[Int] = Some(59610840)
 
   override protected def builds = Seq {
     getBuild(

scalafmt-tests-community/scala2/shared/src/test/scala/org/scalafmt/community/scala2/CommunityScala2Suite.scala

@@ -18,7 +18,7 @@ class CommunityScala2_12Suite extends CommunityScala2Suite("scala-2.12") {
 
 class CommunityScala2_13Suite extends CommunityScala2Suite("scala-2.13") {
 
-  override protected def totalStatesVisited: Option[Int] = Some(52987012)
+  override protected def totalStatesVisited: Option[Int] = Some(52987016)
 
   override protected def builds =
     Seq(getBuild("v2.13.14", dialects.Scala213, 1287))

scalafmt-tests-community/scala3/shared/src/test/scala/org/scalafmt/community/scala3/CommunityScala3Suite.scala

@@ -9,15 +9,15 @@ abstract class CommunityScala3Suite(name: String)
 
 class CommunityScala3_2Suite extends CommunityScala3Suite("scala-3.2") {
 
-  override protected def totalStatesVisited: Option[Int] = Some(39188529)
+  override protected def totalStatesVisited: Option[Int] = Some(39188577)
 
   override protected def builds = Seq(getBuild("3.2.2", dialects.Scala32, 791))
 
 }
 
 class CommunityScala3_3Suite extends CommunityScala3Suite("scala-3.3") {
 
-  override protected def totalStatesVisited: Option[Int] = Some(42292843)
+  override protected def totalStatesVisited: Option[Int] = Some(42292891)
 
   override protected def builds = Seq(getBuild("3.3.3", dialects.Scala33, 861))
 

scalafmt-tests-community/spark/shared/src/test/scala/org/scalafmt/community/spark/CommunitySparkSuite.scala

@@ -9,15 +9,15 @@ abstract class CommunitySparkSuite(name: String)
 
 class CommunitySpark3_4Suite extends CommunitySparkSuite("spark-3.4") {
 
-  override protected def totalStatesVisited: Option[Int] = Some(85958083)
+  override protected def totalStatesVisited: Option[Int] = Some(85958174)
 
   override protected def builds = Seq(getBuild("v3.4.1", dialects.Scala213, 2585))
 
 }
 
 class CommunitySpark3_5Suite extends CommunitySparkSuite("spark-3.5") {
 
-  override protected def totalStatesVisited: Option[Int] = Some(90961547)
+  override protected def totalStatesVisited: Option[Int] = Some(90961638)
 
   override protected def builds = Seq(getBuild("v3.5.3", dialects.Scala213, 2756))
 

scalafmt-tests/shared/src/test/resources/newlines/source_classic.stat

@@ -9258,9 +9258,11 @@ object a {
 }
 >>>
 object a {
-  if ({ rs = counterCells; rs } != null && {
-    m = rs.length; m
-  } > 0 && rs({ j = (m - 1) & h; j }) == null) {
+  if (
+    { rs = counterCells; rs } != null && {
+      m = rs.length; m
+    } > 0 && rs({ j = (m - 1) & h; j }) == null
+  ) {
     rs(j) = r
   }
 }

scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat

@@ -8675,9 +8675,10 @@ object a {
 }
 >>>
 object a {
-  if ({ rs = counterCells; rs } != null && { m = rs.length; m } > 0 && rs({
-    j = (m - 1) & h; j
-  }) == null) { rs(j) = r }
+  if (
+    { rs = counterCells; rs } != null && { m = rs.length; m } > 0 &&
+    rs({ j = (m - 1) & h; j }) == null
+  ) { rs(j) = r }
 }
 <<< #4133 case body enclosed, no break before lparen, no break after lparen
 object a {

scalafmt-tests/shared/src/test/resources/newlines/source_keep.stat

@@ -9063,9 +9063,11 @@ object a {
 }
 >>>
 object a {
-  if ({ rs = counterCells; rs } != null && { m = rs.length; m } > 0 && rs({
-    j = (m - 1) & h; j
-  }) == null) {
+  if (
+    { rs = counterCells; rs } != null && { m = rs.length; m } > 0 && rs({
+      j = (m - 1) & h; j
+    }) == null
+  ) {
     rs(j) = r
   }
 }

scalafmt-tests/shared/src/test/resources/newlines/source_unfold.stat

@@ -9375,17 +9375,19 @@ object a {
 }
 >>>
 object a {
-  if ({
-    rs = counterCells;
-    rs
-  } != null && {
-    m = rs.length;
-    m
-  } > 0 &&
-  rs({
-    j = (m - 1) & h;
-    j
-  }) == null) {
+  if (
+    {
+      rs = counterCells;
+      rs
+    } != null && {
+      m = rs.length;
+      m
+    } > 0 &&
+    rs({
+      j = (m - 1) & h;
+      j
+    }) == null
+  ) {
     rs(j) = r
   }
 }

scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala

@@ -148,7 +148,7 @@ class FormatTests extends FunSuite with CanRunTests with FormatAssertions {
     val explored = Debug.explored.get()
     logger.debug(s"Total explored: $explored")
     if (!onlyUnit && !onlyManual)
-      assertEquals(explored, 2540816, "total explored")
+      assertEquals(explored, 2541354, "total explored")
     // TODO(olafur) don't block printing out test results.
     TestPlatformCompat.executeAndWait(PlatformFileOps.writeFile(
       FileOps.getPath("target", "index.html"),