RedundantBraces: remove nested braces in lambda

scalameta · Nov 11, 2019 · 76d94ed · 76d94ed
1 parent 6083ee1
commit 76d94ed
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 0 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/RedundantBraces.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/RedundantBraces.scala
@@ -130,6 +130,9 @@ case object RedundantBraces extends Rewrite {
         !isProcedureSyntax(d) &&
         !disqualifiedByUnit
 
+      case p: Term.Function if isBlockFunction(p) =>
+        settings.methodBodies
+
       case _ =>
         settings.generalExpressions &&
           exactlyOneStatement &&

diff --git a/scalafmt-tests/src/test/resources/rewrite/RedundantBraces.stat b/scalafmt-tests/src/test/resources/rewrite/RedundantBraces.stat
@@ -154,3 +154,63 @@ object a {
   def x: Int = // comment
     2
 }
+<<< fixes nested block in multi-line lambda 1
+object a {
+
+  method { x => { // 1
+        2
+        3
+        4
+     }
+  }
+
+}
+>>>
+object a {
+  method { x => // 1
+    2
+    3
+    4
+  }
+}
+<<< fixes nested block in multi-line lambda 2
+object a {
+
+  method { x =>
+     { // 1
+        2
+        3
+        4
+     }
+  }
+
+}
+>>>
+object a {
+  method { x =>
+    // 1
+    2
+    3
+    4
+  }
+}
+<<< doesn't touch block in multi-line paren lambda
+object a {
+
+  method ( x =>
+     {
+        2
+        3
+        4
+     }
+  )
+
+}
+>>>
+object a {
+  method(x => {
+    2
+    3
+    4
+  })
+}