Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Router: inline binpack nl policies #3990

Merged
merged 1 commit into from
May 13, 2024
Merged

Router: inline binpack nl policies #3990

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1280,19 +1280,14 @@ class Router(formatOps: FormatOps) {
val nlPolicy = {
def newlineBeforeClose(implicit fileLine: FileLine) =
decideNewlinesOnlyBeforeClose(close)
def binPackOnelinePolicyOpt =
if (needOnelinePolicy) nextCommaOnelinePolicy else Some(NoPolicy)
def bothPolicies(implicit fileLine: FileLine) = newlineBeforeClose &
binPackOnelinePolicyOpt
def configStylePolicy(implicit fileLine: FileLine) =
splitOneArgOneLine(close, leftOwner) | newlineBeforeClose

nlCloseOnOpen match {
case NlClosedOnOpen.No => binPackOnelinePolicyOpt
case NlClosedOnOpen.No =>
if (needOnelinePolicy) nextCommaOnelinePolicy
.getOrElse(decideNewlinesOnlyBeforeCloseOnBreak(close))
else NoPolicy
case NlClosedOnOpen.Cfg if !styleMap.forcedBinPack(leftOwner) =>
configStylePolicy
case _ => bothPolicies
splitOneArgOneLine(close, leftOwner) | newlineBeforeClose
case _ => newlineBeforeClose & nextCommaOnelinePolicy
}
}

Expand Down
Loading