Router: implement Newlines.forceBeforeAssign

scalameta · Aug 11, 2022 · 8bba465 · 8bba465
1 parent ebd6073
commit 8bba465
Show file tree

Hide file tree

Showing 2 changed files with 4 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
@@ -2640,6 +2640,8 @@ class Router(formatOps: FormatOps) {
       Seq(CtrlBodySplits.withIndent(Split(Space.orNL(ft.noBreak), 0), ft, body))
     else if (isJsNative(body))
       Seq(Split(Space, 0).withSingleLine(expire))
+    else if (style.newlines.forceBeforeAssign(ft.meta.leftOwner))
+      Seq(CtrlBodySplits.withIndent(Split(Newline, 0), ft, body))
     else if (style.newlines.shouldForceBeforeMultilineAssign(ft.meta.leftOwner))
       CtrlBodySplits.slbOnly(ft, body, spaceIndents) { x =>
         CtrlBodySplits.withIndent(Split(Newline, x), ft, body)

diff --git a/scalafmt-tests/src/test/resources/newlines/source_unfold.stat b/scalafmt-tests/src/test/resources/newlines/source_unfold.stat
@@ -6127,4 +6127,5 @@ newlines.forceBeforeAssign = def
 def sum(a: Int, b: Int): Int =
   a + b
 >>>
-def sum(a: Int, b: Int): Int = a + b
+def sum(a: Int, b: Int): Int =
+  a + b