Skip to content

RedundantBraces: not every Ident continues Infix #4732

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

Merged
merged 2 commits into from
Jan 20, 2025
Merged

RedundantBraces: not every Ident continues Infix #4732

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
085bf39
Test inconsistent RedundantBraces
kitbellew Jan 20, 2025
5642259
RedundantBraces: not every Ident continues Infix
kitbellew Jan 20, 2025
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
2 changes: 1 addition & 1 deletion scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/RedundantBraces.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ class RedundantBraces(implicit val ftoks: FormatTokens)
val rft = ftoks.matchingRight(ft)
def checkAfterRight(wasNonComment: => Boolean) = {
val nrft = ftoks.nextNonComment(rft)
!nrft.right.is[T.Ident] ||
!nrft.right.is[T.Ident] || !isInfixOp(nrft.rightOwner) ||
wasNonComment && !style.newlines.infix.keep(p) ||
findTreeWithParent(p) { // check if infix is in parens
case pp: Member.ArgClause => ftoks.getClosingIfWithinParensOrBraces(pp)
Expand Down
4 changes: 2 additions & 2 deletions ...intellij/src/test/scala/org/scalafmt/community/intellij/CommunityIntellijScalaSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ abstract class CommunityIntellijScalaSuite(name: String)
class CommunityIntellijScala_2024_2_Suite
extends CommunityIntellijScalaSuite("intellij-scala-2024.2") {

override protected def totalStatesVisited: Option[Int] = Some(59396273)
override protected def totalStatesVisited: Option[Int] = Some(59396257)

override protected def builds = Seq {
getBuild(
Expand Down Expand Up @@ -54,7 +54,7 @@ class CommunityIntellijScala_2024_2_Suite
class CommunityIntellijScala_2024_3_Suite
extends CommunityIntellijScalaSuite("intellij-scala-2024.3") {

override protected def totalStatesVisited: Option[Int] = Some(59611023)
override protected def totalStatesVisited: Option[Int] = Some(59611007)

override protected def builds = Seq {
getBuild(
Expand Down
40 changes: 40 additions & 0 deletions scalafmt-tests/shared/src/test/resources/rewrite/RedundantBraces2.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,3 +642,43 @@ condDefs(nullPointers != CheckedBehavior.Unchecked) {
)
)
}
<<< #4730
class SampleSpec extends AsyncFlatSpec with AsyncIOSpec with Matchers {
"Sample" should "be formatted correctly" in {
IO(1).asserting(_ shouldBe 1)
}

it should "be formatted correctly, too" in {
IO(2).asserting(_ shouldBe 2)
}
}
>>>
class SampleSpec extends AsyncFlatSpec with AsyncIOSpec with Matchers {
"Sample" should "be formatted correctly" in
IO(1).asserting(_ shouldBe 1)

it should "be formatted correctly, too" in
IO(2).asserting(_ shouldBe 2)
}
<<< #4730 1
class SampleSpec extends AsyncFlatSpec with AsyncIOSpec with Matchers {
"Sample" should "be formatted correctly" in {
IO(1).asserting(_ shouldBe 1)
}
}
>>>
class SampleSpec extends AsyncFlatSpec with AsyncIOSpec with Matchers {
"Sample" should "be formatted correctly" in
IO(1).asserting(_ shouldBe 1)
}
<<< #4730 2
class SampleSpec extends AsyncFlatSpec with AsyncIOSpec with Matchers {
it should "be formatted correctly, too" in {
IO(2).asserting(_ shouldBe 2)
}
}
>>>
class SampleSpec extends AsyncFlatSpec with AsyncIOSpec with Matchers {
it should "be formatted correctly, too" in
IO(2).asserting(_ shouldBe 2)
}
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, 1258568, "total explored")
assertEquals(explored, 1258776, "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