FormatOps: fewer-braces func not just in apply

scalameta · Sep 1, 2023 · dc3c435 · dc3c435
1 parent f1ff10e
commit dc3c435
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 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
@@ -2130,8 +2130,7 @@ class FormatOps(
               def owner = t.parent
               def splits = Some(t.values match {
                 case (tf: Term.FunctionTerm) :: Nil
-                    if !style.newlines.alwaysBeforeCurlyLambdaParams &&
-                      t.parent.exists(_.is[Term.Apply]) =>
+                    if !style.newlines.alwaysBeforeCurlyLambdaParams =>
                   getSplits(ft, t, forceNL = false, indentOpt = indent) match {
                     case s +: rs if !s.isNL => funcSplit(tf)(s.fileLine) +: rs
                     case ss => ss

diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat
@@ -5178,5 +5178,5 @@ object a:
     x + 1
 >>>
 object a:
-   List(1, 2, 3) map:
-      x => x + 1
+   List(1, 2, 3) map: x =>
+     x + 1
diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat
@@ -4945,5 +4945,5 @@ object a:
     x + 1
 >>>
 object a:
-   List(1, 2, 3) map:
-      x => x + 1
+   List(1, 2, 3) map: x =>
+     x + 1
diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat
@@ -5213,6 +5213,5 @@ object a:
     x + 1
 >>>
 object a:
-   List(1, 2, 3) map:
-      x =>
-        x + 1
+   List(1, 2, 3) map: x =>
+     x + 1
diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat
@@ -5344,5 +5344,5 @@ object a:
     x + 1
 >>>
 object a:
-   List(1, 2, 3) map:
-      x => x + 1
+   List(1, 2, 3) map: x =>
+     x + 1