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: fix handling of binpack=oneline #3992

Merged
merged 2 commits into from
May 14, 2024
Merged

Router: fix handling of binpack=oneline #3992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99db126
Add tests with failing nested binpack=oneline
kitbellew May 13, 2024
8e438b7
Router: fix handling of binpack=oneline
kitbellew May 13, 2024
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
54 changes: 30 additions & 24 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 @@ -1188,8 +1188,6 @@ class Router(formatOps: FormatOps) {
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)
Expand Down Expand Up @@ -1234,17 +1232,15 @@ class Router(formatOps: FormatOps) {
def optClose = scalaJsOptClose(beforeClose, flags)
val opt = if (oneline) nextCommaOneline else findComma(ft)

val noSplitPolicy =
if (needOnelinePolicy) {
val alignPolicy =
if (noSplitIndents.exists(_.hasStateColumn))
nextCommaOnelinePolicy.map(_ & penalizeNewlinesPolicy)
else None
alignPolicy.getOrElse {
val noSplitPolicy = nextCommaOnelinePolicy
.fold(penalizeNewlinesPolicy) { p =>
if (noSplitIndents.exists(_.hasStateColumn)) p &
penalizeNewlinesPolicy
else {
val slbEnd = nextCommaOneline.getOrElse(close)
SingleLineBlock(slbEnd, noSyntaxNL = true)
}
} else penalizeNewlinesPolicy
}
val indentPolicy =
if (noSplitIndents.nonEmpty) {
def unindentPolicy =
Expand All @@ -1269,11 +1265,12 @@ class Router(formatOps: FormatOps) {
val nlPolicy = {
def newlineBeforeClose(implicit fileLine: FileLine) =
decideNewlinesOnlyBeforeClose(close)
nlCloseOnOpen match {
case NlClosedOnOpen.No =>
if (needOnelinePolicy) nextCommaOnelinePolicy
.getOrElse(decideNewlinesOnlyBeforeCloseOnBreak(close))
else NoPolicy
val nlClosedOnOpenEffective =
if (!noNextCommaOnelineCurried) nlCloseOnOpen
else if (clauseSiteFlags.configStyle.prefer) NlClosedOnOpen.Cfg
else NlClosedOnOpen.Yes
nlClosedOnOpenEffective match {
case NlClosedOnOpen.No => nextCommaOnelinePolicy.getOrElse(NoPolicy)
case NlClosedOnOpen.Cfg if !styleMap.forcedBinPack(leftOwner) =>
splitOneArgOneLine(close, leftOwner) | newlineBeforeClose
case _ => newlineBeforeClose & nextCommaOnelinePolicy
Expand Down Expand Up @@ -1436,13 +1433,23 @@ class Router(formatOps: FormatOps) {
}
val nlPolicy = (if (oneline) nextCommaOrParen else None) match {
case Some(FormatToken(_, t: T.Comma, _)) =>
if (callSite) splitOneArgPerLineAfterCommaOnBreak(t)
else delayedBreakPolicyFor(t)(decideNewlinesOnlyAfterClose)
case Some(FormatToken(_, t, _))
if !callSite ||
leftOwner.parent
.exists(followedBySelectOrApply(_).isDefined) =>
decideNewlinesOnlyBeforeCloseOnBreak(t)
splitOneArgPerLineAfterCommaOnBreak(t)
case Some(_) if callSite =>
def delayBreakBefore(token: T)(implicit fileLine: FileLine) =
delayedBreakPolicyFor(token)(decideNewlinesOnlyBeforeToken)
val endCall = leftOwner.parent.flatMap(followedBySelectOrApply)
endCall.fold(Policy.noPolicy) { x =>
val beforeNext = nextNonCommentSameLine(getLastNonTrivial(x))
beforeNext.right match {
case c: T.Comma => delayBreakBefore(c)
case LeftParenOrBracket() =>
nextNonCommentSameLineAfter(beforeNext).right match {
case _: T.Comment => NoPolicy
case c => delayBreakBefore(c)
}
case _ => NoPolicy
}
}
case _ => NoPolicy
}
val indentOncePolicy =
Expand All @@ -1454,9 +1461,8 @@ class Router(formatOps: FormatOps) {
s.map(x => if (x.isNL) x else x.switch(trigger, true))
}
} else NoPolicy
val noSpace = style.newlines.keepBreak(newlines)
Seq(
Split(noSpace, 0)(Space)
Split(style.newlines.keepBreak(newlines), 0)(Space)
.withSingleLine(endOfSingleLineBlock(optFT), noSyntaxNL = true),
Split(Newline, 1).withPolicy(nlPolicy & indentOncePolicy),
)
Expand Down
3 changes: 1 addition & 2 deletions scalafmt-tests/src/test/resources/newlines/source_classic.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2805,8 +2805,7 @@ object a {
E(Seq(F(1, "v1"), F(2, "v2")),
G(Some(Seq(h, i)),
Some(Seq(j, k)), a.b, c.d,
e.f.g, h.i.j)
).foo
e.f.g, h.i.j)).foo
}
}
<<< binpack call, oneline, with syntaxNL, single arg
Expand Down
3 changes: 1 addition & 2 deletions scalafmt-tests/src/test/resources/newlines/source_keep.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2805,8 +2805,7 @@ object a {
E(Seq(F(1, "v1"), F(2, "v2")),
G(Some(Seq(h, i)),
Some(Seq(j, k)), a.b, c.d,
e.f.g, h.i.j)
).foo
e.f.g, h.i.j)).foo
}
}
<<< binpack call, oneline, with syntaxNL, single arg
Expand Down
45 changes: 43 additions & 2 deletions scalafmt-tests/src/test/resources/scalajs/Apply.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,9 @@ object a {
foo match {
case Apply(appMeth,
Apply(wrapRefArrayMeth,
StripCast(arg @ ArrayValue(elemtpt, elems)) :: Nil) :: classTagEvidence :: Nil)
StripCast(
arg @ ArrayValue(elemtpt, elems)
) :: Nil) :: classTagEvidence :: Nil)
if WrapArray.isClassTagBasedWrapArrayMethod(wrapRefArrayMeth.symbol) &&
appMeth.symbol == ArrayModule_genericApply =>
bar
Expand Down Expand Up @@ -403,7 +405,9 @@ object a {
object a {
Apply(appMeth,
Apply(wrapRefArrayMeth,
StripCast(ArrayValue(elemtpt, elems)) :: Nil) :: classTagEvidence :: Nil)
StripCast(
ArrayValue(elemtpt, elems)
) :: Nil) :: classTagEvidence :: Nil)
}
<<< binpack=always, with infix
maxColumn = 80
Expand Down Expand Up @@ -991,3 +995,40 @@ object a {
}
}
}
<<< nested with oneline
binPack.preset = oneline
danglingParentheses.preset = false
newlines.configStyleCallSite.prefer = true
===
object a {
js.MethodDef(flags, methodIdent, originalName, jsParams, resultType, Some {
genApplyMethod(genLoadModule(moduleClass), m, jsParams.map(_.ref))
})(OptimizerHints.empty, Unversioned)
}
>>>
object a {
js.MethodDef(flags, methodIdent, originalName, jsParams, resultType,
Some {
genApplyMethod(genLoadModule(moduleClass), m, jsParams.map(_.ref))
})(
OptimizerHints.empty, Unversioned)
}
<<< nested with oneline, keep
newlines.source = keep
binPack.preset = oneline
danglingParentheses.preset = false
newlines.configStyleCallSite.prefer = true
===
object a {
js.MethodDef(flags, methodIdent, originalName, jsParams, resultType, Some {
genApplyMethod(genLoadModule(moduleClass), m, jsParams.map(_.ref))
})(OptimizerHints.empty, Unversioned)
}
>>>
object a {
js.MethodDef(flags, methodIdent, originalName, jsParams, resultType,
Some {
genApplyMethod(genLoadModule(moduleClass), m, jsParams.map(_.ref))
})(
OptimizerHints.empty, Unversioned)
}
Loading