Router: implement binPack.indentCallSiteSingleArg

scalameta · Oct 28, 2022 · 69bad29 · 69bad29
1 parent 0e368dc
commit 69bad29
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 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
@@ -1300,6 +1300,7 @@ class Router(formatOps: FormatOps) {
           !isBracket && getAssignAtSingleArgCallSite(leftOwner).isDefined
         val noSplitIndents =
           if (noNoSplitIndents) Nil
+          else if (isSingleArg && !style.binPack.indentCallSiteSingleArg) Nil
           else if (style.binPack.indentCallSiteOnce) {
             @tailrec
             def iter(tree: Tree): Option[T] = tree.parent match {
@@ -1349,7 +1350,7 @@ class Router(formatOps: FormatOps) {
                 SingleLineBlock(slbEnd, noSyntaxNL = true)
               }
             } else penalizeNewlinesPolicy
-            val indentOncePolicy =
+            def indentOncePolicy =
               if (style.binPack.indentCallSiteOnce) {
                 val trigger = getIndentTrigger(leftOwner)
                 Policy.on(close) {
@@ -1362,7 +1363,7 @@ class Router(formatOps: FormatOps) {
               .withOptimalTokenOpt(opt)
               .withPolicy(noSplitPolicy)
               .andPolicy(unindentPolicy, !isSingleArg || noSplitIndents.isEmpty)
-              .andPolicy(indentOncePolicy)
+              .andPolicy(indentOncePolicy, noSplitIndents.isEmpty)
           }
 
         val nlPolicy = {

diff --git a/scalafmt-tests/src/test/resources/default/Apply.stat b/scalafmt-tests/src/test/resources/default/Apply.stat
@@ -2039,14 +2039,14 @@ object a {
 >>>
 object a {
   val ref = foo(bar((_, _) =>
-      baz1 { qux1 =>
-        noop1
-      } baz2 { qux2 =>
-        noop2
-      } baz3 //
-        { qux3 =>
-          noop3
-        } baz4 { qux4 =>
-          noop4
-        }))
+    baz1 { qux1 =>
+      noop1
+    } baz2 { qux2 =>
+      noop2
+    } baz3 //
+      { qux3 =>
+        noop3
+      } baz4 { qux4 =>
+        noop4
+      }))
 }