Router: do not skip indent if binpacking an infix

scalameta · Dec 24, 2021 · 309fc42 · 309fc42
1 parent e2e14a6
commit 309fc42
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 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
@@ -1184,12 +1184,15 @@ class Router(formatOps: FormatOps) {
 
         val indentLen = style.indent.callSite
         val indent = Indent(Num(indentLen), close, Before)
+        val firstArg = argsOpt.flatMap(_.headOption)
         val noNoSplitIndents = nlOnly ||
-          style.binPack.indentCallSiteOnce ||
-          isSingleArg && oneline && !needOnelinePolicy ||
+          !firstArg.exists(isInfixApp) && (style.binPack.indentCallSiteOnce ||
+            isSingleArg && oneline && !needOnelinePolicy) ||
           !isBracket && getAssignAtSingleArgCallSite(leftOwner).isDefined
         val noSplitIndents =
           if (noNoSplitIndents) Nil
+          else if (style.binPack.indentCallSiteOnce && firstArg.isDefined)
+            Seq(Indent(Num(indentLen), firstArg.get.tokens.last, After))
           else if (
             if (isTuple(leftOwner)) style.align.getOpenParenTupleSite
             else style.align.getOpenDelimSite(false, false)
@@ -1417,14 +1420,14 @@ class Router(formatOps: FormatOps) {
                 decideNewlinesOnlyBeforeCloseOnBreak(t)
               case _ => NoPolicy
             }
-            val indentCallSiteOnce =
-              style.binPack.indentCallSiteOnce && callSite
-            val indent = if (indentCallSiteOnce) style.indent.callSite else 0
+            val indent =
+              if (style.binPack.indentCallSiteOnce && callSite) {
+                val indentEnd = if (isInfixApp(nextArg)) lastFT.left else right
+                Indent(style.indent.callSite, indentEnd, After)
+              } else Indent.Empty
             Seq(
               Split(Space, 0).withSingleLine(endOfSingleLineBlock(optFT)),
-              Split(Newline, 1)
-                .withIndent(indent, right, After)
-                .withPolicy(nlPolicy)
+              Split(Newline, 1).withIndent(indent).withPolicy(nlPolicy)
             )
           }
         }

diff --git a/scalafmt-tests/src/test/resources/scalajs/Apply.stat b/scalafmt-tests/src/test/resources/scalajs/Apply.stat
@@ -485,7 +485,7 @@ optDef.getOrElse {
 >>>
 optDef.getOrElse {
   abort(foo &&
-  bar)
+      bar)
   abort(foo &&
       bar,
       baz)
@@ -513,23 +513,23 @@ optDef.getOrElse {
 >>>
 optDef.getOrElse {
   abort(foo &&
-  bar)
+      bar)
   abort(foo &&
-  bar,
+      bar,
       foo &&
-  bar, baz)
+      bar, baz)
   abort(abort(foo &&
-  bar,
+      bar,
       foo &&
-  bar,
+      bar,
       abort(foo &&
-  bar,
+      bar,
       foo &&
-  bar, baz)),
+      bar, baz)),
       abort(foo &&
-  bar,
+      bar,
       foo &&
-  bar, baz))
+      bar, baz))
 }
 <<< binpack with non-top-level-only infix, afterInfix=some
 maxColumn = 20
@@ -546,7 +546,7 @@ optDef.getOrElse {
 >>>
 optDef.getOrElse {
   abort(fooFoo &&
-  barBar)
+      barBar)
   abort(fooFoo &&
       barBar,
       bazBaz)
@@ -566,7 +566,7 @@ optDef.getOrElse {
 >>>
 optDef.getOrElse {
   abort(fooFoo &&
-  barBar)
+      barBar)
   abort(fooFoo &&
       barBar,
       bazBaz)