Router: partial undo on: penalize newlines last

scalameta · Dec 16, 2021 · 9c7b202 · 9c7b202
1 parent 4dde8fe
commit 9c7b202
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 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
@@ -1594,7 +1594,7 @@ class FormatOps(
                 getOpenNLByTree(f, a, penalty)
               case _ => Seq.empty
             }
-            val nextPolicies = policies ++ nestedPolicies :+ pnlPolicy
+            val nextPolicies = (policies :+ pnlPolicy) ++ nestedPolicies
             getOpenNLByArgs(argLastFt, argss.tail, penalty, nextPolicies)
           }
         }

diff --git a/scalafmt-tests/src/test/resources/newlines/source_fold.stat b/scalafmt-tests/src/test/resources/newlines/source_fold.stat
@@ -5157,9 +5157,8 @@ private implicit class ApiExceptionToErrorResponseConverter(ex: ApiException) {
 }
 >>>
 private implicit class ApiExceptionToErrorResponseConverter(ex: ApiException) {
-  def toErrors: Seq[ErrorResponse] = Seq(
-    ErrorResponse(ex.errorType.code, ex.errorType.name, Option(ex.getMessage))
-  )
+  def toErrors: Seq[ErrorResponse] =
+    Seq(ErrorResponse(ex.errorType.code, ex.errorType.name, Option(ex.getMessage)))
 }
 <<< #2965-regression 2
 maxColumn = 100
@@ -5172,7 +5171,6 @@ private implicit class ApiExceptionToErrorResponseConverter(ex: ApiException) {
 }
 >>>
 private implicit class ApiExceptionToErrorResponseConverter(ex: ApiException) {
-  def toErrors: Seq[ErrorResponse] = Seq(
-    ErrorResponse(ex.errorType.code, ex.errorType.name, Option(ex.getMessage))
-  )
+  def toErrors: Seq[ErrorResponse] =
+    Seq(ErrorResponse(ex.errorType.code, ex.errorType.name, Option(ex.getMessage)))
 }