Router: binpack defnsite: rename mustUseNL->nlOnly

scalameta · May 10, 2024 · 51dbd9f · 51dbd9f
1 parent c5122ce
commit 51dbd9f
Showing 1 changed file with 5 additions and 6 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
@@ -1148,22 +1148,21 @@ class Router(formatOps: FormatOps) {
               argPolicy & (opensPolicy | penalizeBrackets)
             }
           val rightIsComment = right.is[T.Comment]
-          val mustUseNL = onlyConfigStyle ||
-            style.newlines.keepBreak(newlines) ||
+          val nlOnly = onlyConfigStyle || style.newlines.keepBreak(newlines) ||
             tokens.isRightCommentWithBreak(ft)
           val noSplitModification =
-            if (rightIsComment && !mustUseNL) getMod(ft) else baseNoSplitMod
-          val nlMod = if (rightIsComment && mustUseNL) getMod(ft) else Newline
+            if (rightIsComment && !nlOnly) getMod(ft) else baseNoSplitMod
+          val nlMod = if (rightIsComment && nlOnly) getMod(ft) else Newline
           def getDanglePolicy(implicit fileLine: FileLine) =
             decideNewlinesOnlyBeforeClose(close)
           val nlPolicy = if (mustDangle) getDanglePolicy else NoPolicy
           def nlCost = bracketPenalty.getOrElse(1)
 
           Seq(
-            Split(mustUseNL, 0)(noSplitModification)
+            Split(nlOnly, 0)(noSplitModification)
               .withOptimalToken(close, ignore = !slbOnly, killOnFail = true)
               .withPolicy(noSplitPolicy).withIndents(noSplitIndents),
-            Split(nlMod, if (mustUseNL || slbOnly) 0 else nlCost)
+            Split(nlMod, if (nlOnly || slbOnly) 0 else nlCost)
               .withPolicy(nlPolicy & nlOnelinePolicy & penalizeBrackets)
               .withIndent(indent),
           )