RedundantBraces: keep braces in func w/ param type

scalameta · Nov 10, 2024 · c7b290e · c7b290e
1 parent 413ea77
commit c7b290e
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 25 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
@@ -629,7 +629,17 @@ class RedundantBraces(implicit val ftoks: FormatTokens)
     (getTreeSingleStat(b) match {
       case Some(_: Term.PartialFunction) => false
       case Some(_: Term.Block) => true
-      case Some(s) => okLineSpan(s)
+      case Some(s) => okLineSpan(s) &&
+        (s match {
+          case f: Term.FunctionTerm =>
+            val params = f.paramClause
+            params.values match {
+              case param :: Nil => param.decltpe.isEmpty ||
+                ftoks.isEnclosedInMatching(params)
+              case _ => true
+            }
+          case _ => true
+        })
       case _ => okIfMultipleStats
     })
 

diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_classic.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_classic.stat
@@ -9816,12 +9816,12 @@ object Build {
     .settings(
       generateScalaDocumentation := Def.inputTaskDyn {
         val outputDirOverride =
-          extraArgs.headOption.fold(identity[GenerationConfig](_)) {
-            newDir => config: GenerationConfig => config.add(OutputDir(newDir))
-          }
-        val justAPI = justAPIArg.fold(identity[GenerationConfig](_)) {
-          _ => config: GenerationConfig => config.remove[SiteRoot]
-        }
+          extraArgs.headOption.fold(identity[GenerationConfig](_))(newDir => {
+            config: GenerationConfig => config.add(OutputDir(newDir))
+          })
+        val justAPI = justAPIArg.fold(identity[GenerationConfig](_))(_ => {
+          config: GenerationConfig => config.remove[SiteRoot]
+        })
       }.evaluated
     )
 }

diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat
@@ -9217,13 +9217,13 @@ object Build {
   lazy val scaladoc = project.in(file("scaladoc"))
     .settings(generateScalaDocumentation := Def.inputTaskDyn {
       val outputDirOverride = extraArgs.headOption
-        .fold(identity[GenerationConfig](_)) {
-          newDir => config: GenerationConfig => config.add(OutputDir(newDir))
-        }
+        .fold(identity[GenerationConfig](_))(newDir => {
+          config: GenerationConfig => config.add(OutputDir(newDir))
+        })
       val justAPI = justAPIArg
-        .fold(identity[GenerationConfig](_)) { _ => config: GenerationConfig =>
+        .fold(identity[GenerationConfig](_))(_ => { config: GenerationConfig =>
           config.remove[SiteRoot]
-        }
+        })
     }.evaluated)
 }
 <<< #4133 monads with binpack and no newlines in types

diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_keep.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_keep.stat
@@ -9612,12 +9612,12 @@ object Build {
   settings(
     generateScalaDocumentation := Def.inputTaskDyn {
       val outputDirOverride =
-        extraArgs.headOption.fold(identity[GenerationConfig](_)) {
-          newDir => config: GenerationConfig => config.add(OutputDir(newDir))
-        }
-      val justAPI = justAPIArg.fold(identity[GenerationConfig](_)) {
-        _ => config: GenerationConfig => config.remove[SiteRoot]
-      }
+        extraArgs.headOption.fold(identity[GenerationConfig](_))(newDir => {
+          config: GenerationConfig => config.add(OutputDir(newDir))
+        })
+      val justAPI = justAPIArg.fold(identity[GenerationConfig](_))(_ => {
+        config: GenerationConfig => config.remove[SiteRoot]
+      })
     }.evaluated
   )
 }

diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_unfold.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_unfold.stat
@@ -9917,15 +9917,15 @@ object Build {
             val outputDirOverride =
               extraArgs
                 .headOption
-                .fold(identity[GenerationConfig](_)) {
-                  newDir => config: GenerationConfig =>
+                .fold(identity[GenerationConfig](_))(newDir => {
+                  config: GenerationConfig =>
                     config.add(OutputDir(newDir))
-                }
+                })
             val justAPI =
-              justAPIArg.fold(identity[GenerationConfig](_)) {
-                _ => config: GenerationConfig =>
+              justAPIArg.fold(identity[GenerationConfig](_))(_ => {
+                config: GenerationConfig =>
                   config.remove[SiteRoot]
-              }
+              })
           }
           .evaluated
     )

diff --git a/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala b/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala
@@ -137,7 +137,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, 1114736, "total explored")
+      assertEquals(explored, 1114537, "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 :'(