Router: keep blank line in empty case clause body

scalameta · Jun 24, 2020 · 51a5a5c · 51a5a5c
1 parent 4fd5b86
commit 51a5a5c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
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
@@ -405,15 +405,17 @@ class Router(formatOps: FormatOps) {
         singleLineSplit +: multiLineSplits
 
       // Case arrow
-      case tok @ FormatToken(arrow @ T.RightArrow(), right, between)
-          if leftOwner.isInstanceOf[Case] =>
+      case tok @ FormatToken(_: T.RightArrow, right, _) if leftOwner.is[Case] =>
         val caseStat = leftOwner.asInstanceOf[Case]
         if (right.is[T.LeftBrace] && (caseStat.body eq rightOwner))
           // Redundant {} block around case statements.
           Seq(Split(Space, 0).withIndent(-2, rightOwner.tokens.last, After))
         else {
-          def newlineSplit(cost: Int) =
-            Split(NewlineT(noIndent = rhsIsCommentedOut(tok)), cost)
+          def newlineSplit(cost: Int) = {
+            val noIndent = rhsIsCommentedOut(tok)
+            val isDouble = tok.hasBlankLine && caseStat.body.tokens.isEmpty
+            Split(NewlineT(isDouble = isDouble, noIndent = noIndent), cost)
+          }
           def foldedSplits =
             caseStat.body match {
               case _ if right.is[T.KwCase] || isSingleLineComment(right) =>

diff --git a/scalafmt-tests/src/test/resources/default/Case.stat b/scalafmt-tests/src/test/resources/default/Case.stat
@@ -212,6 +212,7 @@ object a {
 object a {
   val a = a match {
     case a =>
+
     case b =>
   }
 }