FormatOps: fewer-braces func not just in apply

scalameta · Aug 31, 2023 · b8c334e · b8c334e
1 parent 89fb867
commit b8c334e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 22 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
@@ -5167,18 +5167,16 @@ object a:
   List(1, 2, 3) map: x =>
     x + 1
 >>>
-test does not parse
 object a:
-   List(1, 2, 3) map: x => x + 1
-                      ^
+   List(1, 2, 3) map:
+      x => x + 1
 <<< #3623 !beforeCurlyLambdaParams
 newlines.beforeCurlyLambdaParams = false
 ===
 object a:
   List(1, 2, 3) map: x =>
     x + 1
 >>>
-test does not parse
 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
@@ -4934,18 +4934,16 @@ object a:
   List(1, 2, 3) map: x =>
     x + 1
 >>>
-test does not parse
 object a:
-   List(1, 2, 3) map: x => x + 1
-                      ^
+   List(1, 2, 3) map:
+      x => x + 1
 <<< #3623 !beforeCurlyLambdaParams
 newlines.beforeCurlyLambdaParams = false
 ===
 object a:
   List(1, 2, 3) map: x =>
     x + 1
 >>>
-test does not parse
 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
@@ -5202,8 +5202,9 @@ object a:
     x + 1
 >>>
 object a:
-   List(1, 2, 3) map: x =>
-     x + 1
+   List(1, 2, 3) map:
+      x =>
+        x + 1
 <<< #3623 !beforeCurlyLambdaParams
 newlines.beforeCurlyLambdaParams = false
 ===

diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat
@@ -5333,18 +5333,16 @@ object a:
   List(1, 2, 3) map: x =>
     x + 1
 >>>
-test does not parse
 object a:
-   List(1, 2, 3) map: x => x + 1
-                      ^
+   List(1, 2, 3) map:
+      x => x + 1
 <<< #3623 !beforeCurlyLambdaParams
 newlines.beforeCurlyLambdaParams = false
 ===
 object a:
   List(1, 2, 3) map: x =>
     x + 1
 >>>
-test does not parse
 object a:
-   List(1, 2, 3) map: x => x + 1
-                      ^
+   List(1, 2, 3) map: x =>
+     x + 1