Insert newline for else keyword, fixes #1509. (#1520)

Insert newline for else keyword, fixes #1509.
scalameta · Oct 8, 2019 · fea0efc · fea0efc
2 parents ba6ebc3 + 9c26032
commit fea0efc
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
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
@@ -1178,7 +1178,8 @@ class Router(formatOps: FormatOps) {
         )
       case FormatToken(RightBrace(), KwElse(), _) =>
         if (style.newlines.alwaysBeforeElseAfterCurlyIf) Seq(Split(Newline, 0))
-        else Seq(Split(Space, 0))
+        else if (leftOwner.is[Term.Block]) Seq(Split(Space, 0))
+        else Seq(Split(Newline, 1))
       case FormatToken(RightBrace(), KwYield(), _) =>
         Seq(
           Split(Space, 0)

diff --git a/scalafmt-tests/src/test/resources/test/Issue1509.stat b/scalafmt-tests/src/test/resources/test/Issue1509.stat
@@ -0,0 +1,21 @@
+maxColumn=41
+<<< issue 1509
+val x =
+if (true)
+  List() match {
+    case x :: xs => ???
+    case Nil => ???
+  }
+else {
+  2
+}
+>>>
+val x =
+  if (true)
+    List() match {
+      case x :: xs => ???
+      case Nil     => ???
+    }
+  else {
+    2
+  }