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: skip braces when looking for binpack comma #4312

Merged
merged 3 commits into from
Sep 23, 2024
Merged

Router: skip braces when looking for binpack comma #4312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
563f77d
Add failing tests with binpack lambda with braces
kitbellew Sep 23, 2024
54a04e0
FormatTokens: add a more generic findTokenEx
kitbellew Sep 23, 2024
058dea9
Router: skip braces when looking for binpack comma
kitbellew Sep 23, 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
13 changes: 8 additions & 5 deletions scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatTokens.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,17 @@ class FormatTokens(leftTok2tok: Map[TokenHash, Int])(val arr: Array[FormatToken]
getClosingIfInParens(last)(getHead(tokens, tree)).getOrElse(last)
}

@tailrec
final def findTokenWith[A](ft: FormatToken, iter: FormatToken => FormatToken)(
f: FormatToken => Option[A],
): Either[FormatToken, A] = findTokenEx(ft)(xft => f(xft).toRight(iter(xft)))

@tailrec
final def findTokenEx[A](ft: FormatToken)(
f: FormatToken => Either[FormatToken, A],
): Either[FormatToken, A] = f(ft) match {
case Some(a) => Right(a)
case _ =>
val nextFt = iter(ft)
if (nextFt eq ft) Left(ft) else findTokenWith(nextFt, iter)(f)
case null => Left(ft)
case Left(nextFt) if nextFt ne ft => findTokenEx(nextFt)(f)
case x => x
}

final def findToken(ft: FormatToken, iter: FormatToken => FormatToken)(
Expand Down
13 changes: 9 additions & 4 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 @@ -1205,9 +1205,6 @@ class Router(formatOps: FormatOps) {
flags.literalArgList
val nlOnly = nlOpen && !singleLineOnly

def findComma(ft: FormatToken) = findFirstOnRight[T.Comma](ft, close)
.map(_.right)

val binPack = style.binPack.callSiteFor(open)
val oneline = binPack.isOneline
val afterFirstArgOneline =
Expand Down Expand Up @@ -1266,7 +1263,15 @@ class Router(formatOps: FormatOps) {
else Seq(indent)

val nextComma =
if (!oneline) findComma(ft)
if (firstArg.isEmpty) None
else if (!oneline) tokens.findTokenEx(ft) { xft =>
xft.right match {
case `close` | _: T.RightBrace | _: T.RightArrow => null
case x: T.Comma => Right(x)
case x: T.LeftBrace => Left(tokens(matching(x)))
case _ => Left(next(xft))
}
}.toOption
else if (isSingleArg) None
else afterFirstArgOneline.map(_.right)
val opt = nextComma.getOrElse(scalaJsOptClose(beforeClose, flags))
Expand Down
12 changes: 12 additions & 0 deletions scalafmt-tests/shared/src/test/resources/scalajs/Apply.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,3 +1403,15 @@ object a {
varDefs.take(prevArgsCount).toList.map(_.ref))(
sym, index, formalArgsRegistry, param, static, captures = Nil)
}
<<< #4133 overflow with nested lambda and braces 1
Block(norm.tail.map(sym => DefDef(sym, { vparamss: List[List[Symbol]] => EmptyTree })), ddef)
>>>
Block(norm.tail.map(sym =>
DefDef(sym, { vparamss: List[List[Symbol]] => EmptyTree })), ddef)
<<< #4133 overflow with nested lambda and braces 2
other.exists(tpe match { case TypeRef(_, r, _) => r.isTypeParameter case _ => false })
>>>
other.exists(tpe match {
case TypeRef(_, r, _) => r.isTypeParameter
case _ => false
})
Loading