FormatOps: fix cond between while and do

scalameta · Aug 6, 2024 · bc090bb · bc090bb
1 parent ff84fb2
commit bc090bb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 23 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala
@@ -2016,7 +2016,8 @@ class FormatOps(
           style: ScalafmtConfig,
       ): Option[OptionalBracesRegion] = ft.meta.leftOwner match {
         case t @ Term.While(b: Term.Block, _)
-            if !matchingOpt(nft.right).exists(_.end >= b.pos.end) =>
+            if isMultiStatBlock(b) &&
+              !matchingOpt(nft.right).exists(_.end >= b.pos.end) =>
           Some(new OptionalBracesRegion {
             def owner = Some(t)
             def splits = Some {

diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat
@@ -699,13 +699,9 @@ object a:
       i -= 1
     }
 >>>
-Idempotency violated
-=> Diff (- obtained, + expected)
- object a:
--   while i > 0 && foo
-+   while
-+      i > 0 && foo
-    do i -= 1
+object a:
+   while i > 0 && foo
+   do i -= 1
 <<< nested if-else multiple
 object a:
   val a =

diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat
@@ -677,13 +677,8 @@ object a:
       i -= 1
     }
 >>>
-Idempotency violated
-=> Diff (- obtained, + expected)
- object a:
--   while i > 0 && foo do i -= 1
-+   while
-+      i > 0 && foo
-+   do i -= 1
+object a:
+   while i > 0 && foo do i -= 1
 <<< nested if-else multiple
 object a:
   val a =

diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat
@@ -752,14 +752,9 @@ object a:
       i -= 1
     }
 >>>
-Idempotency violated
-=> Diff (- obtained, + expected)
- object a:
--   while i > 0 && foo do
-+   while
-+      i > 0 && foo
-+   do
-       i -= 1
+object a:
+   while i > 0 && foo do
+      i -= 1
 <<< nested if-else multiple
 object a:
   val a =