Router: refactor nlPolicy for binpack.callSite

scalameta · Apr 4, 2024 · 481621a · 481621a
1 parent e937fc3
commit 481621a
Showing 1 changed file with 7 additions and 8 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
@@ -1288,20 +1288,19 @@ class Router(formatOps: FormatOps) {
 
         val nlPolicy = {
           def newlineBeforeClose = decideNewlinesOnlyBeforeClose(close)
-          def binPackOnelinePolicy =
-            if (needOnelinePolicy) nextCommaOnelinePolicy
-              .getOrElse(decideNewlinesOnlyBeforeCloseOnBreak(close))
-            else NoPolicy
+          def binPackOnelinePolicyOpt =
+            if (needOnelinePolicy) nextCommaOnelinePolicy else Some(NoPolicy)
+          def bothPolicies = newlineBeforeClose & binPackOnelinePolicyOpt
           if (onlyConfigStyle)
-            if (styleMap.forcedBinPack(leftOwner)) newlineBeforeClose &
-              binPackOnelinePolicy
+            if (styleMap.forcedBinPack(leftOwner)) bothPolicies
             else splitOneArgOneLine(close, leftOwner) | newlineBeforeClose
           else if (
             mustDangleForTrailingCommas ||
             style.danglingParentheses.tupleOrCallSite(isTuple(leftOwner)) &&
             (style.newlines.sourceIgnored || !style.optIn.configStyleArguments)
-          ) newlineBeforeClose & binPackOnelinePolicy
-          else binPackOnelinePolicy
+          ) bothPolicies
+          else binPackOnelinePolicyOpt
+            .getOrElse(decideNewlinesOnlyBeforeCloseOnBreak(close))
         }
         val nlMod =
           if (rightIsComment && nlOnly) getMod(ft)