Router: fold single-line case arrow body if unfold

scalameta · Oct 28, 2021 · db5ec56 · db5ec56
1 parent 08d7897
commit db5ec56
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 22 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala
@@ -480,6 +480,7 @@ class Router(formatOps: FormatOps) {
           else if (ft.right.is[T.KwCase]) Seq(nlSplit(ft)(0))
           else if (beforeMultiline eq Newlines.unfold) {
             if (ft.right.is[T.Semicolon]) Seq(baseSplit, nlSplit(ft)(1))
+            else if (style.newlines.source ne Newlines.unfold) withSlbSplit
             else Seq(nlSplit(ft)(0))
           } else if (ft.hasBreak && !beforeMultiline.ignoreSourceSplit)
             Seq(nlSplit(ft)(0))

diff --git a/scalafmt-tests/src/test/resources/newlines/source_classic.stat b/scalafmt-tests/src/test/resources/newlines/source_classic.stat
@@ -4659,8 +4659,6 @@ assembly / assemblyMergeStrategy := {
 }
 >>>
 assembly / assemblyMergeStrategy := {
-  case A("B", c @ _*) =>
-    D.e
-  case _ =>
-    E.f
+  case A("B", c @ _*) => D.e
+  case _ => E.f
 }
diff --git a/scalafmt-tests/src/test/resources/newlines/source_fold.stat b/scalafmt-tests/src/test/resources/newlines/source_fold.stat
@@ -4456,8 +4456,6 @@ assembly / assemblyMergeStrategy := {
 }
 >>>
 assembly / assemblyMergeStrategy := {
-  case A("B", c @ _*) =>
-    D.e
-  case _ =>
-    E.f
+  case A("B", c @ _*) => D.e
+  case _ => E.f
 }
diff --git a/scalafmt-tests/src/test/resources/newlines/source_keep.stat b/scalafmt-tests/src/test/resources/newlines/source_keep.stat
@@ -4685,8 +4685,6 @@ assembly / assemblyMergeStrategy := {
 }
 >>>
 assembly / assemblyMergeStrategy := {
-  case A("B", c @ _*) =>
-    D.e
-  case _ =>
-    E.f
+  case A("B", c @ _*) => D.e
+  case _ => E.f
 }
diff --git a/scalafmt-tests/src/test/resources/scala3/InlineTransparent.stat b/scalafmt-tests/src/test/resources/scala3/InlineTransparent.stat
@@ -91,10 +91,8 @@ transparent inline def g(x: Any): Any =   inline x match {
 >>>
 transparent inline def g(x: Any): Any =
   inline x match {
-    case x: String =>
-      (x, x) // Tuple2[String, String](x, x)
-    case x: Double =>
-      x
+    case x: String => (x, x) // Tuple2[String, String](x, x)
+    case x: Double => x
   }
 <<< complex
 inline def repro[T <: Int with Singleton  ,   U <: Int with Singleton]: Int = 

diff --git a/scalafmt-tests/src/test/resources/scala3/Macro.stat b/scalafmt-tests/src/test/resources/scala3/Macro.stat
@@ -113,8 +113,7 @@ body match {
         sum(${ Varargs(subArgs) }: _*)
       } if aVeryLongCondition(parameter) =>
     subArgs.flatMap(flatSumArgs)
-  case body =>
-    body
+  case body => body
 }
 <<< macro pattern fold
 newlines.beforeMultiline = fold

diff --git a/scalafmt-tests/src/test/resources/scala3/MatchType.stat b/scalafmt-tests/src/test/resources/scala3/MatchType.stat
@@ -91,10 +91,8 @@ newlines.beforeMultiline = unfold
 >>>
 type Elem[X] =
   X match {
-    case String =>
-      Array[AVeryLongTraitNameToTestOutSomeThings]
-    case Array[t] =>
-      t
+    case String   => Array[AVeryLongTraitNameToTestOutSomeThings]
+    case Array[t] => t
   }
 <<< match type fold
 newlines.beforeMultiline = fold