Router: observe source=keep even when binpacking

scalameta · Jan 20, 2022 · 3bba344 · 3bba344
1 parent 2fc85ab
commit 3bba344
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 22 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
@@ -1478,8 +1478,11 @@ class Router(formatOps: FormatOps) {
                     s.map { x => if (x.isNL) x else x.switch(trigger, true) }
                 }
               } else NoPolicy
+            val noSpace =
+              style.newlines.source.eq(Newlines.keep) && newlines != 0
             Seq(
-              Split(Space, 0).withSingleLine(endOfSingleLineBlock(optFT)),
+              Split(noSpace, 0)(Space)
+                .withSingleLine(endOfSingleLineBlock(optFT)),
               Split(Newline, 1).withPolicy(nlPolicy & indentOncePolicy)
             )
           }

diff --git a/scalafmt-tests/src/test/resources/binPack/LiteralList.stat b/scalafmt-tests/src/test/resources/binPack/LiteralList.stat
@@ -230,6 +230,8 @@ object a {
 >>>
 object a {
   val foo = app.search(
-    bar.baz, qux.foo, bar.qux, baz, bar
+    bar.baz,
+    qux.foo, bar.qux,
+    baz, bar
   )
 }
diff --git a/scalafmt-tests/src/test/resources/newlines/source_keep.stat b/scalafmt-tests/src/test/resources/newlines/source_keep.stat
@@ -4765,8 +4765,8 @@ object a {
 }
 >>>
 object a {
-  def foo(bb: BB, cc: CC, dd: DD = DDD.ddd): Bar[
-    Baz] = {
+  def foo(bb: BB, cc: CC,
+      dd: DD = DDD.ddd): Bar[Baz] = {
     // c
     qux
   }
@@ -4877,20 +4877,21 @@ object a {
 >>>
 object a {
   when(
-    service.list(ApiAudienceFilter(tenants = Contains(Seq(ATenant))), Page(0, Page.maxPageLimit),
-      Order.default)
+    service.list(ApiAudienceFilter(tenants = Contains(Seq(ATenant))),
+      Page(0, Page.maxPageLimit), Order.default)
   ).thenReturn(PageResult(Seq(audience, audience.copy(id = 2)), PageInfo(50, 0, 10)))
 
   when(
-    service.list(ApiAudienceFilter(tenants), Contains(Seq(ATenant)), Page(0, Page.maxPageLimit),
-      Order.default)
+    service.list(ApiAudienceFilter(tenants), Contains(Seq(ATenant)),
+      Page(0, Page.maxPageLimit), Order.default)
   ).thenReturn(PageResult(Seq(audience, audience.copy(id = 2)), PageInfo(50, 0, 10)))
 
-  when(service.list(ApiAudienceFilter(tenants), Contains(Seq(ATenant))), Page(0, Page.maxPageLimit),
-    Order.default).thenReturn(PageResult(Seq(audience, audience.copy(id = 2)), PageInfo(50, 0, 10)))
+  when(service.list(ApiAudienceFilter(tenants), Contains(Seq(ATenant))),
+    Page(0, Page.maxPageLimit), Order.default).thenReturn(
+    PageResult(Seq(audience, audience.copy(id = 2)), PageInfo(50, 0, 10)))
 
-  when(service.list(ApiAudienceFilter(tenants), Contains(Seq(ATenant))), Page(0, Page.maxPageLimit),
-    Order.default,
+  when(service.list(ApiAudienceFilter(tenants), Contains(Seq(ATenant))),
+    Page(0, Page.maxPageLimit), Order.default,
     PageResult(Seq(audience, audience.copy(id = 2)), PageInfo(50, 0, 10))).thenReturn(None)
 }
 <<< unsafeCallSite = always, nested with one arg
@@ -4944,19 +4945,20 @@ object a {
 }
 >>>
 object a {
-  when(service.list(ApiAudienceFilter(tenants = Contains(Seq(ATenant))), Page(0, Page.maxPageLimit),
-      Order.default)).thenReturn(PageResult(Seq(audience, audience.copy(id = 2)),
-      PageInfo(50, 0, 10)))
+  when(service.list(ApiAudienceFilter(tenants = Contains(Seq(ATenant))),
+      Page(0, Page.maxPageLimit), Order.default)).thenReturn(PageResult(Seq(audience,
+        audience.copy(id = 2)), PageInfo(50, 0, 10)))
 
-  when(service.list(ApiAudienceFilter(tenants), Contains(Seq(ATenant)), Page(0, Page.maxPageLimit),
-      Order.default)).thenReturn(PageResult(Seq(audience, audience.copy(id = 2)),
-      PageInfo(50, 0, 10)))
+  when(service.list(ApiAudienceFilter(tenants), Contains(Seq(ATenant)),
+      Page(0, Page.maxPageLimit), Order.default)).thenReturn(PageResult(Seq(audience,
+        audience.copy(id = 2)), PageInfo(50, 0, 10)))
 
-  when(service.list(ApiAudienceFilter(tenants), Contains(Seq(ATenant))), Page(0, Page.maxPageLimit),
-    Order.default).thenReturn(PageResult(Seq(audience, audience.copy(id = 2)), PageInfo(50, 0, 10)))
+  when(service.list(ApiAudienceFilter(tenants), Contains(Seq(ATenant))),
+    Page(0, Page.maxPageLimit), Order.default).thenReturn(PageResult(Seq(audience,
+        audience.copy(id = 2)), PageInfo(50, 0, 10)))
 
-  when(service.list(ApiAudienceFilter(tenants), Contains(Seq(ATenant))), Page(0, Page.maxPageLimit),
-    Order.default,
+  when(service.list(ApiAudienceFilter(tenants), Contains(Seq(ATenant))),
+    Page(0, Page.maxPageLimit), Order.default,
     PageResult(Seq(audience, audience.copy(id = 2)), PageInfo(50, 0, 10))).thenReturn(None)
 }
 <<< #2821 default