FormatOps: in one-arg-per-line, handle lbrace case

Fixes scalameta#1599.
kitbellew · Feb 18, 2020 · f080da3 · f080da3
1 parent 18552ba
commit f080da3
Show file tree

Hide file tree

Showing 4 changed files with 79 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
@@ -387,11 +387,28 @@ class FormatOps(val tree: Tree, val initStyle: ScalafmtConfig) {
       // Newline on every comma.
       case Decision(t @ FormatToken(_: T.Comma, right, _), splits)
           if owner == t.meta.leftOwner &&
-            // TODO(olafur) what the right { decides to be single line?
-            !right.is[T.LeftBrace] &&
             // If comment is bound to comma, see unit/Comment.
             (!right.is[T.Comment] || t.newlinesBetween != 0) =>
-        splits.filter(_.modification.isNewline)
+        if (!right.is[T.LeftBrace])
+          splits.filter(_.modification.isNewline)
+        else if (!style.activeForEdition_2020_01)
+          splits
+        else
+          t.meta.rightOwner match {
+            case _: Term.PartialFunction |
+                Term.Block(List(_: Term.Function | _: Term.PartialFunction)) =>
+              Seq(Split(Newline, 0))
+            case _ =>
+              val closeBrace = matching(right)
+              val breakAfter = nextNonCommentSameLine(t).right
+              val multiLine = newlinesOnlyBeforeClosePolicy(closeBrace)
+                .orElse(decideNewlinesOnlyAfterToken(breakAfter))
+              Seq(
+                Split(Newline, 0, policy = SingleLineBlock(closeBrace))
+                  .withOptimalToken(closeBrace, killOnFail = true),
+                Split(Space, 1, policy = multiLine)
+              )
+          }
     }
   }
 

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
@@ -906,21 +906,8 @@ class Router(formatOps: FormatOps) {
           Split(NoSplit, 0)
         )
       // non-statement starting curly brace
-      case FormatToken(left, open @ T.LeftBrace(), _) =>
-        val close = matching(open)
-        val isComma = left.is[T.Comma]
-        val bodyHasNewlines = if (isComma) {
-          open.pos.endLine != close.pos.startLine
-        } else {
-          true
-        }
-        Seq(
-          Split(Space, 0),
-          Split(Newline, 0)
-            .onlyIf(isComma && newlines != 0 && !bodyHasNewlines)
-            .withOptimalToken(close, killOnFail = true)
-            .withPolicy(SingleLineBlock(close))
-        )
+      case FormatToken(_, _: T.LeftBrace, _) =>
+        Seq(Split(Space, 0))
 
       // Delim
       case FormatToken(_, T.Comma(), _) =>

diff --git a/scalafmt-tests/src/test/resources/default/Apply.stat b/scalafmt-tests/src/test/resources/default/Apply.stat
@@ -207,7 +207,8 @@ writeRead(
     // Use list because Array has a shitty toString
     { (b: List[Byte], os) =>
       os.writePosVarInt(b.size); os.writeBytes(b.toArray)
-    }, { is =>
+    },
+    { is =>
       val bytes = new Array[Byte](is.readPosVarInt)
       is.readFully(bytes)
       bytes.toList

diff --git a/...-tests/src/test/resources/newlines/beforeConfigSingleArgParenLambdaParamsF_danglingT.stat b/...-tests/src/test/resources/newlines/beforeConfigSingleArgParenLambdaParamsF_danglingT.stat
@@ -714,7 +714,24 @@ object A {
   }
 }
 >>>
-Unable to format file due to bug in scalafmt
+object A {
+  def foo() = {
+    x.map(
+      _.y(
+        abcd,
+        { case ((abcdefghij, aswbasdfaw), asfda) => aswdf },
+        {
+          case (abcdefghij, sadfasdass) =>
+            (
+              asdfa.sadvfs(abcdefghij).get,
+              asdfasdfasfdasda.asdfas(asdfasdaas).get
+            )
+        },
+        foo
+      )
+    )
+  }
+}
 <<< #1599 2: modified, with partial func inside block
 object A {
   def foo() = {
@@ -727,7 +744,26 @@ object A {
   }
 }
 >>>
-Unable to format file due to bug in scalafmt
+object A {
+  def foo() = {
+    x.map(
+      _.y(
+        abcd,
+        { { case ((abcdefghij, aswbasdfaw), asfda) => aswdf } },
+        {
+          {
+            case (abcdefghij, sadfasdass) =>
+              (
+                asdfa.sadvfs(abcdefghij).get,
+                asdfasdfasfdasda.asdfas(asdfasdaas).get
+              )
+          }
+        },
+        foo
+      )
+    )
+  }
+}
 <<< #1599 3: modified, with lambda
 object A {
   def foo() = {
@@ -740,4 +776,20 @@ object A {
   }
 }
 >>>
-Unable to format file due to bug in scalafmt
+object A {
+  def foo() = {
+    x.map(
+      _.y(
+        abcd,
+        { case_abcdefghij_aswbasdfaw_asfda => aswdf },
+        { case_abcdefghij_sadfasdass =>
+          (
+            asdfa.sadvfs(abcdefghij).get,
+            asdfasdfasfdasda.asdfas(asdfasdaas).get
+          )
+        },
+        foo
+      )
+    )
+  }
+}