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

FormatOps: simplify logic of defnSiteLastToken #4427

Merged
merged 1 commit into from
Oct 9, 2024
Merged

FormatOps: simplify logic of defnSiteLastToken #4427

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
33 changes: 11 additions & 22 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 @@ -209,28 +209,17 @@ class FormatOps(

// invoked on closing paren, part of ParamClause
@tailrec
final def defnSiteLastToken(close: FormatToken, t: Tree): FormatToken = {
def alt = getLast(t)
t match {
case _: Term.ParamClause | _: Type.FuncParamClause |
_: Member.ParamClauseGroup => t.parent match {
case Some(p) => defnSiteLastToken(close, p)
case _ => alt
}
case t: Defn.Def => getHeadOpt(t.body).fold(alt) { ft =>
if (ft.left.is[T.LeftBrace] && t.body.is[Term.Block]) ft
else prevNonCommentBefore(ft)
}
case _: Ctor.Primary => close match {
// This is a terrible terrible hack. Please consider removing this.
// The RightParen() LeftBrace() pair is presumably a ") {" combination
// at a class definition
case FormatToken(_: T.RightParen, _: T.LeftBrace, _) => next(close)
case _ => close
}
case t => t.tokens.find(x => x.is[T.Equals] && owners(x) == t)
.fold(alt)(before)
}
final def defnSiteLastToken(t: Tree): Option[FormatToken] = t match {
case _: Term.ParamClause | _: Type.FuncParamClause | _: Type.FunctionType |
_: Member.ParamClauseGroup => t.parent match {
case Some(p) => defnSiteLastToken(p)
case _ => None
}
case t: Defn.Macro => tokenBeforeOpt(t.body).map(prevNonCommentBefore)
case t: Tree.WithBody => tokenBeforeOpt(t.body)
case t: Stat.WithTemplate => tokenBeforeOpt(t.templ)
case t: Decl => getLastOpt(t)
case _ => None
}

@inline
Expand Down
14 changes: 8 additions & 6 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 @@ -415,7 +415,8 @@ class Router(formatOps: FormatOps) {
}
}

val nlSplit = Split(nl, 1).withPolicy(newlineBeforeClosingCurly)
val nlSplit = Split(nl, if (nl.isNL) 1 else 0)
.withPolicy(newlineBeforeClosingCurly)
.withIndent(style.indent.main, close, Before)

// must be after nlSplit
Expand Down Expand Up @@ -953,10 +954,11 @@ class Router(formatOps: FormatOps) {
val isBeforeOpenParen =
if (defnSite) style.newlines.isBeforeOpenParenDefnSite
else style.newlines.isBeforeOpenParenCallSite
val optimalFt: FormatToken = getSlbEndOnLeft(
if (isBeforeOpenParen || !defnSite || isBracket) afterClose
else defnSiteLastToken(afterClose, leftOwner),
)
val optimalFtOpt =
if (isBeforeOpenParen || !defnSite || isBracket) None
else defnSiteLastToken(leftOwner)
val optimalFt: FormatToken =
getSlbEndOnLeft(optimalFtOpt.getOrElse(afterClose))
val optimal = optimalFt.left

val wouldDangle = onlyConfigStyle || mustDangleForTrailingCommas ||
Expand Down Expand Up @@ -2676,7 +2678,7 @@ class Router(formatOps: FormatOps) {
def newlineSplit(cost: Int)(implicit fileLine: FileLine) = CtrlBodySplits
.withIndent(Split(Newline2x(ft), cost), body, endFt)

def getClassicSplits =
def getClassicSplits(implicit fileLine: FileLine) =
if (ft.hasBreak) Seq(newlineSplit(0)) else Seq(baseSplit, newlineSplit(1))

style.newlines.beforeMultilineDef.fold {
Expand Down
2 changes: 1 addition & 1 deletion scalafmt-tests/shared/src/test/resources/default/Advanced.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ options.testFilter match {
}, { // else
callStatement
})(jstpe.AnyType)
>>> { stateVisits = 1739, stateVisits2 = 1727 }
>>> { stateVisits = 1740, stateVisits2 = 1728 }
callStatement = js.If(
genIsInstanceOf(callTrg, rtClass.tpe), {
if (implMethodSym.owner == ObjectClass) {
Expand Down
2 changes: 1 addition & 1 deletion scalafmt-tests/shared/src/test/resources/default/Lambda.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ opt[File]("migrate2hocon")
Some(AbsoluteFile.fromFile(file, c.common.workingDirectory))))
.text("""migrate .scalafmt CLI style configuration to hocon style configuration in .scalafmt.conf""")
}}
>>> { stateVisits = 890, stateVisits2 = 889 }
>>> { stateVisits = 895, stateVisits2 = 894 }
{
{
opt[File]("migrate2hocon")
Expand Down
2 changes: 1 addition & 1 deletion scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class FormatTests extends FunSuite with CanRunTests with FormatAssertions {
override def afterAll(): Unit = {
logger.debug(s"Total explored: ${Debug.explored}")
if (!onlyUnit && !onlyManual)
assertEquals(Debug.explored, 1776701, "total explored")
assertEquals(Debug.explored, 1775524, "total explored")
val results = debugResults.result()
// TODO(olafur) don't block printing out test results.
// I don't want to deal with scalaz's Tasks :'(
Expand Down
Loading