FormatOps: bugfix, check else for opening brace

scalameta · Aug 17, 2022 · 7229211 · 7229211
1 parent 135dfc4
commit 7229211
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 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
@@ -2529,7 +2529,7 @@ class FormatOps(
     @tailrec
     private def isElsePWithOptionalBraces(tree: Term.If): Boolean = {
       val elsep = tree.elsep
-      !tokenBefore(elsep).left.is[T.LeftBrace] && (elsep match {
+      !tokens.getHead(elsep).left.is[T.LeftBrace] && (elsep match {
         case t: Term.If =>
           isThenPWithOptionalBraces(t) ||
           !ifWithoutElse(t) && isElsePWithOptionalBraces(t)

diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat
@@ -3547,7 +3547,8 @@ class Foo() {
     }
 
   def notOK: Boolean =
-    if (1 == 1) true
+    if (1 == 1)
+      true
     else {
       println("Some code")
       false

diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat
@@ -3530,7 +3530,7 @@ class Foo() {
 
   def notOK: Boolean =
     if (1 == 1)
-       true
+      true
     else {
       println("Some code")
       false

diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat
@@ -3655,7 +3655,7 @@ class Foo() {
 
   def notOK: Boolean =
     if (1 == 1)
-       true
+      true
     else {
       println("Some code")
       false