Splits: handle do-while conditions as well

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

@@ -2003,12 +2003,10 @@ object SplitsAfterLeftParen extends Splits {
         else alignIndents,
       ))
     }
-    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 t: Tree.WithCond if !isTokenHeadOrBefore(left, t) =>
+        impl(isEnclosedInBraces(t.cond))
       case _ => None
     }
   }

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(59399907)
+  override protected def totalStatesVisited: Option[Int] = Some(59404572)
 
   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(59614646)
+  override protected def totalStatesVisited: Option[Int] = Some(59619311)
 
   override protected def builds = Seq {
     getBuild(

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

@@ -9,7 +9,7 @@ abstract class CommunityScala2Suite(name: String)
 
 class CommunityScala2_12Suite extends CommunityScala2Suite("scala-2.12") {
 
-  override protected def totalStatesVisited: Option[Int] = Some(42553260)
+  override protected def totalStatesVisited: Option[Int] = Some(42553676)
 
   override protected def builds =
     Seq(getBuild("v2.12.20", dialects.Scala212, 1277))
@@ -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(53018051)
+  override protected def totalStatesVisited: Option[Int] = Some(53018427)
 
   override protected def builds =
     Seq(getBuild("v2.13.14", dialects.Scala213, 1287))

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(85964934)
+  override protected def totalStatesVisited: Option[Int] = Some(85967060)
 
   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(90969442)
+  override protected def totalStatesVisited: Option[Int] = Some(90971586)
 
   override protected def builds = Seq(getBuild("v3.5.3", dialects.Scala213, 2756))
 

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

@@ -12081,7 +12081,55 @@ object a {
     |baz
     |qux""".stripMargin
 }
-<<< `do` starts a new statement
+<<< `do` starts a new statement, narrow, danglingParentheses.ctrlSite
+danglingParentheses.ctrlSite = true
+===
+def foo = {
+    next.offset = begCharOffset
+    do putCharAndNext()
+    while (ch != CR && ch != LF && ch != FF && ch != SU)
+}
+>>>
+def foo = {
+  next.offset = begCharOffset
+  do putCharAndNext()
+  while (
+    ch != CR && ch != LF && ch != FF && ch != SU
+  )
+}
+<<< `do` starts a new statement, wide, danglingParentheses.ctrlSite
+maxColumn = 60
+danglingParentheses.ctrlSite = true
+===
+def foo = {
+    next.offset = begCharOffset
+    do putCharAndNext()
+    while (ch != CR && ch != LF && ch != FF && ch != SU)
+}
+>>>
+def foo = {
+  next.offset = begCharOffset
+  do putCharAndNext()
+  while (ch != CR && ch != LF && ch != FF && ch != SU)
+}
+<<< `do` starts a new statement, narrow, !danglingParentheses.ctrlSite
+danglingParentheses.ctrlSite = false
+===
+def foo = {
+    next.offset = begCharOffset
+    do putCharAndNext()
+    while (ch != CR && ch != LF && ch != FF && ch != SU)
+}
+>>>
+def foo = {
+  next.offset = begCharOffset
+  do putCharAndNext()
+  while (ch != CR && ch != LF && ch != FF && ch != SU)
+}
+<<< `do` starts a new statement, wide, !danglingParentheses.ctrlSite
+maxColumn = 60
+danglingParentheses.ctrlSite = false
+===
 def foo = {
     next.offset = begCharOffset
     do putCharAndNext()

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

@@ -11308,7 +11308,57 @@ object a {
         |baz
         |qux""".stripMargin
 }
-<<< `do` starts a new statement
+<<< `do` starts a new statement, narrow, danglingParentheses.ctrlSite
+danglingParentheses.ctrlSite = true
+===
+def foo = {
+    next.offset = begCharOffset
+    do putCharAndNext()
+    while (ch != CR && ch != LF && ch != FF && ch != SU)
+}
+>>>
+def foo = {
+  next.offset = begCharOffset
+  do putCharAndNext() while (
+    ch != CR && ch != LF && ch != FF &&
+      ch != SU
+  )
+}
+<<< `do` starts a new statement, wide, danglingParentheses.ctrlSite
+maxColumn = 60
+danglingParentheses.ctrlSite = true
+===
+def foo = {
+    next.offset = begCharOffset
+    do putCharAndNext()
+    while (ch != CR && ch != LF && ch != FF && ch != SU)
+}
+>>>
+def foo = {
+  next.offset = begCharOffset
+  do putCharAndNext() while (
+    ch != CR && ch != LF && ch != FF && ch != SU
+  )
+}
+<<< `do` starts a new statement, narrow, !danglingParentheses.ctrlSite
+danglingParentheses.ctrlSite = false
+===
+def foo = {
+    next.offset = begCharOffset
+    do putCharAndNext()
+    while (ch != CR && ch != LF && ch != FF && ch != SU)
+}
+>>>
+def foo = {
+  next.offset = begCharOffset
+  do putCharAndNext()
+  while (ch != CR && ch != LF &&
+      ch != FF && ch != SU)
+}
+<<< `do` starts a new statement, wide, !danglingParentheses.ctrlSite
+maxColumn = 60
+danglingParentheses.ctrlSite = false
+===
 def foo = {
     next.offset = begCharOffset
     do putCharAndNext()
@@ -11317,8 +11367,8 @@ def foo = {
 >>>
 def foo = {
   next.offset = begCharOffset
-  do putCharAndNext() while (ch != CR &&
-    ch != LF && ch != FF && ch != SU)
+  do putCharAndNext()
+  while (ch != CR && ch != LF && ch != FF && ch != SU)
 }
 <<< splits: `after equals` or `before statement` 1
 maxColumn = 80

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

@@ -11853,7 +11853,55 @@ object a {
       |baz
       |qux""".stripMargin
 }
-<<< `do` starts a new statement
+<<< `do` starts a new statement, narrow, danglingParentheses.ctrlSite
+danglingParentheses.ctrlSite = true
+===
+def foo = {
+    next.offset = begCharOffset
+    do putCharAndNext()
+    while (ch != CR && ch != LF && ch != FF && ch != SU)
+}
+>>>
+def foo = {
+  next.offset = begCharOffset
+  do putCharAndNext()
+  while (
+    ch != CR && ch != LF && ch != FF && ch != SU
+  )
+}
+<<< `do` starts a new statement, wide, danglingParentheses.ctrlSite
+maxColumn = 60
+danglingParentheses.ctrlSite = true
+===
+def foo = {
+    next.offset = begCharOffset
+    do putCharAndNext()
+    while (ch != CR && ch != LF && ch != FF && ch != SU)
+}
+>>>
+def foo = {
+  next.offset = begCharOffset
+  do putCharAndNext()
+  while (ch != CR && ch != LF && ch != FF && ch != SU)
+}
+<<< `do` starts a new statement, narrow, !danglingParentheses.ctrlSite
+danglingParentheses.ctrlSite = false
+===
+def foo = {
+    next.offset = begCharOffset
+    do putCharAndNext()
+    while (ch != CR && ch != LF && ch != FF && ch != SU)
+}
+>>>
+def foo = {
+  next.offset = begCharOffset
+  do putCharAndNext()
+  while (ch != CR && ch != LF && ch != FF && ch != SU)
+}
+<<< `do` starts a new statement, wide, !danglingParentheses.ctrlSite
+maxColumn = 60
+danglingParentheses.ctrlSite = false
+===
 def foo = {
     next.offset = begCharOffset
     do putCharAndNext()

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

@@ -12322,7 +12322,9 @@ object a {
         |baz
         |qux""".stripMargin
 }
-<<< `do` starts a new statement
+<<< `do` starts a new statement, narrow, danglingParentheses.ctrlSite
+danglingParentheses.ctrlSite = true
+===
 def foo = {
     next.offset = begCharOffset
     do putCharAndNext()
@@ -12336,6 +12338,52 @@ def foo = {
       ch != SU
   )
 }
+<<< `do` starts a new statement, wide, danglingParentheses.ctrlSite
+maxColumn = 60
+danglingParentheses.ctrlSite = true
+===
+def foo = {
+    next.offset = begCharOffset
+    do putCharAndNext()
+    while (ch != CR && ch != LF && ch != FF && ch != SU)
+}
+>>>
+def foo = {
+  next.offset = begCharOffset
+  do putCharAndNext() while (
+    ch != CR && ch != LF && ch != FF && ch != SU
+  )
+}
+<<< `do` starts a new statement, narrow, !danglingParentheses.ctrlSite
+danglingParentheses.ctrlSite = false
+===
+def foo = {
+    next.offset = begCharOffset
+    do putCharAndNext()
+    while (ch != CR && ch != LF && ch != FF && ch != SU)
+}
+>>>
+def foo = {
+  next.offset = begCharOffset
+  do putCharAndNext()
+  while (ch != CR && ch != LF &&
+      ch != FF && ch != SU)
+}
+<<< `do` starts a new statement, wide, !danglingParentheses.ctrlSite
+maxColumn = 60
+danglingParentheses.ctrlSite = false
+===
+def foo = {
+    next.offset = begCharOffset
+    do putCharAndNext()
+    while (ch != CR && ch != LF && ch != FF && ch != SU)
+}
+>>>
+def foo = {
+  next.offset = begCharOffset
+  do putCharAndNext()
+  while (ch != CR && ch != LF && ch != FF && ch != SU)
+}
 <<< splits: `after equals` or `before statement` 1
 maxColumn = 80
 ===

scalafmt-tests/shared/src/test/resources/rewrite/RedundantBraces.stat

@@ -2480,9 +2480,15 @@ object a {
 >>>
 object a {
   do foo
-  while (true)
+  while (
+    true
+  )
   do a + b
-  while (true)
+  while (
+    true
+  )
   do a + b
-  while (true)
+  while (
+    true
+  )
 }

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, 2549280, "total explored")
+      assertEquals(explored, 2552242, "total explored")
     // TODO(olafur) don't block printing out test results.
     TestPlatformCompat.executeAndWait(PlatformFileOps.writeFile(
       FileOps.getPath("target", "index.html"),