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

FormatTokens: fix getLastExceptParen, incl comment #4568

Merged
merged 2 commits into from
Nov 20, 2024
Merged

FormatTokens: fix getLastExceptParen, incl comment #4568

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
3ad7a7e
Test match with/without dot and trailing comment
kitbellew Nov 20, 2024
2a6c932
FormatTokens: fix getLastExceptParen, incl comment
kitbellew Nov 20, 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
5 changes: 3 additions & 2 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 @@ -161,8 +161,9 @@ class FormatTokens(leftTok2tok: Map[TokenHash, Int])(val arr: Array[FT])

def getLastExceptParen(tree: Tree): FT = {
val tokens = tree.tokens
val last = getLastNonTrivial(tokens, tree)
getClosingIfWithinParens(last)(getHead(tokens, tree)).getOrElse(last)
val last = getLast(tokens, tree)
getClosingIfWithinParens(prevNonComment(last))(getHead(tokens, tree))
.getOrElse(last)
}

final def findTokenWith[A](ft: FT, iter: FT => FT)(
Expand Down
2 changes: 1 addition & 1 deletion ...sts-community/spark/src/test/scala/org/scalafmt/community/spark/CommunitySparkSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class CommunitySpark3_4Suite extends CommunitySparkSuite("spark-3.4") {

class CommunitySpark3_5Suite extends CommunitySparkSuite("spark-3.5") {

override protected def totalStatesVisited: Option[Int] = Some(91352350)
override protected def totalStatesVisited: Option[Int] = Some(91352348)

override protected def builds =
Seq(getBuild("v3.5.3", dialects.Scala213, 2756))
Expand Down
20 changes: 20 additions & 0 deletions scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7603,3 +7603,23 @@ object a {
.match
case _ =>
}
<<< match with dot, trailing case comment
object a:
b.c.match
case d if e => f
// comment
>>>
object a:
b.c.match
case d if e => f
// comment
<<< match without dot, trailing case comment
object a:
b.c match
case d if e => f
// comment
>>>
object a:
b.c match
case d if e => f
// comment
20 changes: 20 additions & 0 deletions scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_fold.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7311,3 +7311,23 @@ object a {
(a.b(c)).match
case _ =>
}
<<< match with dot, trailing case comment
object a:
b.c.match
case d if e => f
// comment
>>>
object a:
b.c.match
case d if e => f
// comment
<<< match without dot, trailing case comment
object a:
b.c match
case d if e => f
// comment
>>>
object a:
b.c match
case d if e => f
// comment
20 changes: 20 additions & 0 deletions scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_keep.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7630,3 +7630,23 @@ object a {
(a.b(c)).match
case _ =>
}
<<< match with dot, trailing case comment
object a:
b.c.match
case d if e => f
// comment
>>>
object a:
b.c.match
case d if e => f
// comment
<<< match without dot, trailing case comment
object a:
b.c match
case d if e => f
// comment
>>>
object a:
b.c match
case d if e => f
// comment
23 changes: 23 additions & 0 deletions scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_unfold.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7919,3 +7919,26 @@ object a {
(a.b(c)).match
case _ =>
}
<<< match with dot, trailing case comment
object a:
b.c.match
case d if e => f
// comment
>>>
object a:
b.c
.match
case d if e =>
f
// comment
<<< match without dot, trailing case comment
object a:
b.c match
case d if e => f
// comment
>>>
object a:
b.c match
case d if e =>
f
// comment
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 @@ -144,7 +144,7 @@ class FormatTests extends FunSuite with CanRunTests with FormatAssertions {
val explored = Debug.explored.get()
logger.debug(s"Total explored: $explored")
if (!onlyUnit && !onlyManual)
assertEquals(explored, 1083470, "total explored")
assertEquals(explored, 1083760, "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