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

RedundantParens: keep parens in given infix type #4657

Merged
merged 2 commits into from
Dec 20, 2024
Merged

RedundantParens: keep parens in given infix type #4657

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
ea11a9d
Test redundant parens with infix type in `given`
kitbellew Dec 19, 2024
64c729b
RedundantParens: keep parens in `given` infix type
kitbellew Dec 19, 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
10 changes: 9 additions & 1 deletion scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/RedundantParens.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,14 @@ object RedundantParens extends Rewrite with FormatTokensRewrite.RuleFactory {
}
}

private def okToReplaceDeclTpe(p: Tree.WithDeclTpe, t: Tree): Boolean =
(t, p) match {
// https://dotty.epfl.ch/docs/reference/syntax.html#declarations-and-definitions-1
// given requires AnnotType, not any Type
case (_: Type.ApplyInfix, _: Stat.GivenLike) => false
case _ => true
}

}

class RedundantParens(implicit val ftoks: FormatTokens)
Expand Down Expand Up @@ -126,7 +134,7 @@ class RedundantParens(implicit val ftoks: FormatTokens)
case _ => true
}
case pia: Member.Infix => okToReplaceInfix(pia, t)
case p: Tree.WithDeclTpe if p.decltpe eq t => true
case p: Tree.WithDeclTpe if p.decltpe eq t => okToReplaceDeclTpe(p, t)
case p: Tree.WithDeclTpeOpt if p.decltpe.contains(t) => true
case _ => okToReplaceOther(t)
}
Expand Down
6 changes: 6 additions & 0 deletions scalafmt-tests/shared/src/test/resources/rewrite/RedundantParens.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1787,3 +1787,9 @@ object a {
)
}
}
<<< #4645
runner.dialect = scala3
===
given fooBar: (Foo & Bar) = new Foo with Bar {}
>>>
given fooBar: (Foo & Bar) = new Foo with Bar {}
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, 1208516, "total explored")
assertEquals(explored, 1208552, "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