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

Jump to bottom

Router: to debug, use FileLine in binpack policies #3930

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Router: to debug, use FileLine in binpack policies #3930

Show file tree
Hide file tree
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: 8 additions & 7 deletions scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,14 +322,15 @@ class FormatOps(
getOneArgPerLineSplitsAfterComma(right, splits)
}

def splitOneArgPerLineAfterCommaOnBreak(comma: T): Policy =
delayedBreakPolicyBefore(comma) {
Policy.after(comma) {
case Decision(t @ FormatToken(`comma`, right, _), splits)
if !right.is[T.Comment] || t.hasBreak =>
getOneArgPerLineSplitsAfterComma(right, splits)
}
def splitOneArgPerLineAfterCommaOnBreak(
comma: T,
)(implicit fileLine: FileLine): Policy = delayedBreakPolicyBefore(comma) {
Policy.after(comma) {
case Decision(t @ FormatToken(`comma`, right, _), splits)
if !right.is[T.Comment] || t.hasBreak =>
getOneArgPerLineSplitsAfterComma(right, splits)
}
}

private def getOneArgPerLineSplitsAfterComma(r: T, s: Seq[Split]) =
if (r.is[T.LeftBrace]) SplitTag.OneArgPerLine.activateOnly(s)
Expand Down
11 changes: 8 additions & 3 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 @@ -1275,17 +1275,22 @@ class Router(formatOps: FormatOps) {
}

val nlPolicy = {
def newlineBeforeClose = decideNewlinesOnlyBeforeClose(close)
def newlineBeforeClose(implicit fileLine: FileLine) =
decideNewlinesOnlyBeforeClose(close)
def binPackOnelinePolicyOpt =
if (needOnelinePolicy) nextCommaOnelinePolicy else Some(NoPolicy)
def bothPolicies = newlineBeforeClose & binPackOnelinePolicyOpt
def bothPolicies(implicit fileLine: FileLine) = newlineBeforeClose &
binPackOnelinePolicyOpt
def configStylePolicy(implicit fileLine: FileLine) =
splitOneArgOneLine(close, leftOwner) | newlineBeforeClose

if (flags.configStyle != ConfigStyle.None)
if (
(style.newlines.source == Newlines.keep &&
flags.configStyle == ConfigStyle.Source) ||
styleMap.forcedBinPack(leftOwner)
) bothPolicies
else splitOneArgOneLine(close, leftOwner) | newlineBeforeClose
else configStylePolicy
else if (
flags.dangleForTrailingCommas ||
flags.shouldDangle &&
Expand Down
Loading