FormatOps: bugfix, check else for opening brace

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

@@ -2162,8 +2162,9 @@ class FormatOps(
               def rightBrace = blockLast(b)
             })
           case t @ Term.If(_, thenp, _) if !nft.right.is[T.KwThen] && {
-                isTreeMultiStatBlock(thenp) || isElsePWithOptionalBraces(t) ||
-                !ifWithoutElse(t) && existsBlockIfWithoutElse(thenp, false)
+                isTreeMultiStatBlock(thenp) || !ifWithoutElse(t) &&
+                (isElsePWithOptionalBraces(t) ||
+                  existsBlockIfWithoutElse(thenp, false))
               } =>
             Some(new OptionalBracesRegion {
               def owner = Some(t)
@@ -2526,16 +2527,18 @@ class FormatOps(
     }
 
     @tailrec
-    private def isElsePWithOptionalBraces(tree: Term.If): Boolean =
-      !ifWithoutElse(tree) &&
-        !tokenBefore(tree.elsep).left.is[T.LeftBrace] &&
-        (tree.elsep match {
-          case t: Term.If =>
-            isThenPWithOptionalBraces(t) || isElsePWithOptionalBraces(t)
-          case Term.Block(List(t: Term.If)) =>
-            isThenPWithOptionalBraces(t) || isElsePWithOptionalBraces(t)
-          case t => isTreeMultiStatBlock(t)
-        })
+    private def isElsePWithOptionalBraces(tree: Term.If): Boolean = {
+      val elsep = tree.elsep
+      !tokens.getHead(elsep).left.is[T.LeftBrace] && (elsep match {
+        case t: Term.If =>
+          isThenPWithOptionalBraces(t) ||
+          !ifWithoutElse(t) && isElsePWithOptionalBraces(t)
+        case Term.Block(List(t: Term.If)) =>
+          isThenPWithOptionalBraces(t) ||
+          !ifWithoutElse(t) && isElsePWithOptionalBraces(t)
+        case t => isTreeMultiStatBlock(t)
+      })
+    }
 
     private def shouldBreakInOptionalBraces(
         ft: FormatToken

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

@@ -5971,3 +5971,37 @@ class Foo() {
     try { c; a + b }.foo
     finally { c; a + b }.foo
 }
+<<< #3295 1
+class Foo() {
+  def ok: Boolean =
+    if (1 == 1)
+      true
+    else {
+      false
+    }
+
+  def notOK: Boolean =
+    if (1 == 1)
+      true
+    else {
+      println("Some code")
+      false
+    }
+}
+>>>
+class Foo() {
+  def ok: Boolean =
+    if (1 == 1)
+      true
+    else {
+      false
+    }
+
+  def notOK: Boolean =
+    if (1 == 1)
+      true
+    else {
+      println("Some code")
+      false
+    }
+}

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

@@ -5685,3 +5685,32 @@ class Foo() {
     try { c; a + b }.foo
     finally { c; a + b }.foo
 }
+<<< #3295 1
+class Foo() {
+  def ok: Boolean =
+    if (1 == 1)
+      true
+    else {
+      false
+    }
+
+  def notOK: Boolean =
+    if (1 == 1)
+      true
+    else {
+      println("Some code")
+      false
+    }
+}
+>>>
+class Foo() {
+  def ok: Boolean =
+    if (1 == 1) true else { false }
+
+  def notOK: Boolean =
+    if (1 == 1) true
+    else {
+      println("Some code")
+      false
+    }
+}

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

@@ -5977,3 +5977,37 @@ class Foo() {
     try { c; a + b }.foo
     finally { c; a + b }.foo
 }
+<<< #3295 1
+class Foo() {
+  def ok: Boolean =
+    if (1 == 1)
+      true
+    else {
+      false
+    }
+
+  def notOK: Boolean =
+    if (1 == 1)
+      true
+    else {
+      println("Some code")
+      false
+    }
+}
+>>>
+class Foo() {
+  def ok: Boolean =
+    if (1 == 1)
+      true
+    else {
+      false
+    }
+
+  def notOK: Boolean =
+    if (1 == 1)
+      true
+    else {
+      println("Some code")
+      false
+    }
+}

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

@@ -6129,3 +6129,37 @@ def sum(a: Int, b: Int): Int =
 >>>
 def sum(a: Int, b: Int): Int =
   a + b
+<<< #3295 1
+class Foo() {
+  def ok: Boolean =
+    if (1 == 1)
+      true
+    else {
+      false
+    }
+
+  def notOK: Boolean =
+    if (1 == 1)
+      true
+    else {
+      println("Some code")
+      false
+    }
+}
+>>>
+class Foo() {
+  def ok: Boolean =
+    if (1 == 1)
+      true
+    else {
+      false
+    }
+
+  def notOK: Boolean =
+    if (1 == 1)
+      true
+    else {
+      println("Some code")
+      false
+    }
+}

scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat

@@ -3518,3 +3518,39 @@ class Foo() {
     try { c; a + b }.foo
     finally { c; a + b }.foo
 }
+<<< #3295 1
+maxColumn = 40
+===
+class Foo() {
+  def ok: Boolean =
+    if (1 == 1)
+      true
+    else {
+      false
+    }
+
+  def notOK: Boolean =
+    if (1 == 1)
+      true
+    else {
+      println("Some code")
+      false
+    }
+}
+>>>
+class Foo() {
+  def ok: Boolean =
+    if (1 == 1)
+      true
+    else {
+      false
+    }
+
+  def notOK: Boolean =
+    if (1 == 1)
+      true
+    else {
+      println("Some code")
+      false
+    }
+}

scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat

@@ -3349,3 +3349,34 @@ class Foo() {
     try { c; a + b }.foo
     finally { c; a + b }.foo
 }
+<<< #3295 1
+maxColumn = 40
+===
+class Foo() {
+  def ok: Boolean =
+    if (1 == 1)
+      true
+    else {
+      false
+    }
+
+  def notOK: Boolean =
+    if (1 == 1)
+      true
+    else {
+      println("Some code")
+      false
+    }
+}
+>>>
+class Foo() {
+  def ok: Boolean =
+    if (1 == 1) true else { false }
+
+  def notOK: Boolean =
+    if (1 == 1) true
+    else {
+      println("Some code")
+      false
+    }
+}

scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat

@@ -3500,3 +3500,39 @@ class Foo() {
     try { c; a + b }.foo
     finally { c; a + b }.foo
 }
+<<< #3295 1
+maxColumn = 40
+===
+class Foo() {
+  def ok: Boolean =
+    if (1 == 1)
+      true
+    else {
+      false
+    }
+
+  def notOK: Boolean =
+    if (1 == 1)
+      true
+    else {
+      println("Some code")
+      false
+    }
+}
+>>>
+class Foo() {
+  def ok: Boolean =
+    if (1 == 1)
+      true
+    else {
+      false
+    }
+
+  def notOK: Boolean =
+    if (1 == 1)
+      true
+    else {
+      println("Some code")
+      false
+    }
+}

scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat

@@ -3625,3 +3625,39 @@ class Foo() {
         a + b
       }.foo
 }
+<<< #3295 1
+maxColumn = 40
+===
+class Foo() {
+  def ok: Boolean =
+    if (1 == 1)
+      true
+    else {
+      false
+    }
+
+  def notOK: Boolean =
+    if (1 == 1)
+      true
+    else {
+      println("Some code")
+      false
+    }
+}
+>>>
+class Foo() {
+  def ok: Boolean =
+    if (1 == 1)
+      true
+    else {
+      false
+    }
+
+  def notOK: Boolean =
+    if (1 == 1)
+      true
+    else {
+      println("Some code")
+      false
+    }
+}