From 2f91f3e08a777ebe08357d6051f1f21dc27eee59 Mon Sep 17 00:00:00 2001
From: Albert Meltzer <7529386+kitbellew@users.noreply.github.com>
Date: Wed, 20 Nov 2024 13:30:31 -0800
Subject: [PATCH] Test if-else with one side a block

---
 .../resources/newlines/source_classic.stat    | 48 +++++++++++++
 .../test/resources/newlines/source_fold.stat  | 48 +++++++++++++
 .../test/resources/newlines/source_keep.stat  | 48 +++++++++++++
 .../resources/newlines/source_unfold.stat     | 69 +++++++++++++++++++
 .../test/scala/org/scalafmt/FormatTests.scala |  2 +-
 5 files changed, 214 insertions(+), 1 deletion(-)

diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_classic.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_classic.stat
index ea4c96ae48..311aff28d7 100644
--- a/scalafmt-tests/shared/src/test/resources/newlines/source_classic.stat
+++ b/scalafmt-tests/shared/src/test/resources/newlines/source_classic.stat
@@ -11201,3 +11201,51 @@ extends SomeBaseClass
 with SomeTrait
 >>>
 class SomeClass(a: Int, b: Double, c: String) extends SomeBaseClass with SomeTrait
+<<< if-else with one block, short
+maxColumn = 40
+===
+object a {
+  if (s.costWithPenalty > 0) { preFork = false; false } else true
+
+  if (s.costWithPenalty <= 0) true else { preFork = false; false }
+}
+>>>
+object a {
+  if (s.costWithPenalty > 0) {
+    preFork = false; false
+  } else true
+
+  if (s.costWithPenalty <= 0) true
+  else { preFork = false; false }
+}
+<<< if-else with one block, medium
+maxColumn = 60
+===
+object a {
+  if (s.costWithPenalty > 0) { preFork = false; false } else true
+
+  if (s.costWithPenalty <= 0) true else { preFork = false; false }
+}
+>>>
+object a {
+  if (s.costWithPenalty > 0) { preFork = false; false }
+  else true
+
+  if (s.costWithPenalty <= 0) true
+  else { preFork = false; false }
+}
+<<< if-else with one block, long
+maxColumn = 80
+===
+object a {
+  if (s.costWithPenalty > 0) { preFork = false; false } else true
+
+  if (s.costWithPenalty <= 0) true else { preFork = false; false }
+}
+>>>
+object a {
+  if (s.costWithPenalty > 0) { preFork = false; false }
+  else true
+
+  if (s.costWithPenalty <= 0) true else { preFork = false; false }
+}
diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat
index fb2cc75977..058dc55a42 100644
--- a/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat
+++ b/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat
@@ -10467,3 +10467,51 @@ extends SomeBaseClass
 with SomeTrait
 >>>
 class SomeClass(a: Int, b: Double, c: String) extends SomeBaseClass with SomeTrait
+<<< if-else with one block, short
+maxColumn = 40
+===
+object a {
+  if (s.costWithPenalty > 0) { preFork = false; false } else true
+
+  if (s.costWithPenalty <= 0) true else { preFork = false; false }
+}
+>>>
+object a {
+  if (s.costWithPenalty > 0) {
+    preFork = false; false
+  } else true
+
+  if (s.costWithPenalty <= 0) true
+  else { preFork = false; false }
+}
+<<< if-else with one block, medium
+maxColumn = 60
+===
+object a {
+  if (s.costWithPenalty > 0) { preFork = false; false } else true
+
+  if (s.costWithPenalty <= 0) true else { preFork = false; false }
+}
+>>>
+object a {
+  if (s.costWithPenalty > 0) { preFork = false; false }
+  else true
+
+  if (s.costWithPenalty <= 0) true
+  else { preFork = false; false }
+}
+<<< if-else with one block, long
+maxColumn = 80
+===
+object a {
+  if (s.costWithPenalty > 0) { preFork = false; false } else true
+
+  if (s.costWithPenalty <= 0) true else { preFork = false; false }
+}
+>>>
+object a {
+  if (s.costWithPenalty > 0) { preFork = false; false }
+  else true
+
+  if (s.costWithPenalty <= 0) true else { preFork = false; false }
+}
diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_keep.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_keep.stat
index ac5f2eb313..9b614345e2 100644
--- a/scalafmt-tests/shared/src/test/resources/newlines/source_keep.stat
+++ b/scalafmt-tests/shared/src/test/resources/newlines/source_keep.stat
@@ -10953,3 +10953,51 @@ with SomeTrait
 class SomeClass(a: Int, b: Double, c: String)
     extends SomeBaseClass
     with SomeTrait
+<<< if-else with one block, short
+maxColumn = 40
+===
+object a {
+  if (s.costWithPenalty > 0) { preFork = false; false } else true
+
+  if (s.costWithPenalty <= 0) true else { preFork = false; false }
+}
+>>>
+object a {
+  if (s.costWithPenalty > 0) {
+    preFork = false; false
+  } else true
+
+  if (s.costWithPenalty <= 0) true
+  else { preFork = false; false }
+}
+<<< if-else with one block, medium
+maxColumn = 60
+===
+object a {
+  if (s.costWithPenalty > 0) { preFork = false; false } else true
+
+  if (s.costWithPenalty <= 0) true else { preFork = false; false }
+}
+>>>
+object a {
+  if (s.costWithPenalty > 0) { preFork = false; false }
+  else true
+
+  if (s.costWithPenalty <= 0) true
+  else { preFork = false; false }
+}
+<<< if-else with one block, long
+maxColumn = 80
+===
+object a {
+  if (s.costWithPenalty > 0) { preFork = false; false } else true
+
+  if (s.costWithPenalty <= 0) true else { preFork = false; false }
+}
+>>>
+object a {
+  if (s.costWithPenalty > 0) { preFork = false; false }
+  else true
+
+  if (s.costWithPenalty <= 0) true else { preFork = false; false }
+}
diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_unfold.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_unfold.stat
index 28b9365d8b..d4edd42f46 100644
--- a/scalafmt-tests/shared/src/test/resources/newlines/source_unfold.stat
+++ b/scalafmt-tests/shared/src/test/resources/newlines/source_unfold.stat
@@ -11360,3 +11360,72 @@ extends SomeBaseClass
 with SomeTrait
 >>>
 class SomeClass(a: Int, b: Double, c: String) extends SomeBaseClass with SomeTrait
+<<< if-else with one block, short
+maxColumn = 40
+===
+object a {
+  if (s.costWithPenalty > 0) { preFork = false; false } else true
+
+  if (s.costWithPenalty <= 0) true else { preFork = false; false }
+}
+>>>
+object a {
+  if (s.costWithPenalty > 0) {
+    preFork = false;
+    false
+  } else
+    true
+
+  if (s.costWithPenalty <= 0)
+    true
+  else {
+    preFork = false;
+    false
+  }
+}
+<<< if-else with one block, medium
+maxColumn = 60
+===
+object a {
+  if (s.costWithPenalty > 0) { preFork = false; false } else true
+
+  if (s.costWithPenalty <= 0) true else { preFork = false; false }
+}
+>>>
+object a {
+  if (s.costWithPenalty > 0) {
+    preFork = false;
+    false
+  } else
+    true
+
+  if (s.costWithPenalty <= 0)
+    true
+  else {
+    preFork = false;
+    false
+  }
+}
+<<< if-else with one block, long
+maxColumn = 80
+===
+object a {
+  if (s.costWithPenalty > 0) { preFork = false; false } else true
+
+  if (s.costWithPenalty <= 0) true else { preFork = false; false }
+}
+>>>
+object a {
+  if (s.costWithPenalty > 0) {
+    preFork = false;
+    false
+  } else
+    true
+
+  if (s.costWithPenalty <= 0)
+    true
+  else {
+    preFork = false;
+    false
+  }
+}
diff --git a/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala b/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala
index 64a6829812..e2d2ec65be 100644
--- a/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala
+++ b/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala
@@ -144,7 +144,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, 1084768, "total explored")
+      assertEquals(explored, 1086266, "total explored")
     val results = debugResults.result()
     // TODO(olafur) don't block printing out test results.
     // I don't want to deal with scalaz's Tasks :'(