Router: binpack=oneline: add explicit state names

scalameta · May 14, 2024 · 26a244e · 26a244e
1 parent 54b7004
commit 26a244e
Showing 1 changed file with 10 additions and 10 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
@@ -1182,13 +1182,14 @@ class Router(formatOps: FormatOps) {
         val nextCommaOneline =
           if (!oneline || isSingleArg) None
           else firstArg.map(getLast).flatMap(findComma)
-        val needOnelinePolicy = oneline &&
-          (nextCommaOneline.isDefined ||
-            leftOwner.parent.exists(followedBySelectOrApply(_).isDefined))
-        val nextCommaOnelinePolicy =
-          if (needOnelinePolicy) nextCommaOneline
-            .map(splitOneArgPerLineAfterCommaOnBreak)
-          else None
+        val nextCommaOnelinePolicy = nextCommaOneline
+          .map(splitOneArgPerLineAfterCommaOnBreak)
+
+        val noNextCommaOneline = oneline && nextCommaOneline.isEmpty
+        val noNextCommaOnelineCurried = noNextCommaOneline &&
+          leftOwner.parent.exists(followedBySelectOrApply(_).isDefined)
+        val needOnelinePolicy = nextCommaOneline.isDefined ||
+          noNextCommaOnelineCurried
 
         val indentLen = style.indent.callSite
         val indent = Indent(Num(indentLen), close, Before)
@@ -1206,15 +1207,14 @@ class Router(formatOps: FormatOps) {
           Split(Space(style.spaces.inParentheses), 0)
         val noNLPolicy = flags.noNLPolicy
         val slbOrNL = nlOnly || singleLineOnly || noNLPolicy == null ||
-          needOnelinePolicy && nextCommaOneline.isEmpty
+          noNextCommaOnelineCurried
 
         val noSplit =
           if (nlOnly) Split.ignored
           else if (slbOrNL) baseNoSplit.withSingleLine(close, noSyntaxNL = true)
           else {
             def okSingleArgsIndents = singleArgAsInfix.isEmpty &&
-              (!oneline || needOnelinePolicy) &&
-              style.binPack.indentCallSiteSingleArg &&
+              !noNextCommaOneline && style.binPack.indentCallSiteSingleArg &&
               (isBracket || getAssignAtSingleArgCallSite(args).isEmpty)
             val noSplitIndents =
               if (isSingleArg && !okSingleArgsIndents) Nil