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

RewriteTrailingCommas: allow tuples as well #3665

Merged
merged 2 commits into from
Oct 19, 2023
Merged

RewriteTrailingCommas: allow tuples as well #3665

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
fe3f90b
Add test with trailing commas in tuple
kitbellew Oct 18, 2023
275b2fb
RewriteTrailingCommas: allow tuples as well
kitbellew Oct 18, 2023
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: 4 additions & 1 deletion scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/RewriteTrailingCommas.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ private class RewriteTrailingCommas(ftoks: FormatTokens)

// comma and paren/bracket/brace need to have the same owner
(rightOwner eq nft.meta.rightOwner) && (nft.right match {
case _: Token.RightBracket | _: Token.RightParen =>
case _: Token.RightParen =>
rightOwner.isAny[Member.SyntaxValuesClause, Member.Tuple]

case _: Token.RightBracket =>
rightOwner.is[Member.SyntaxValuesClause]

case _: Token.RightBrace =>
Expand Down
7 changes: 7 additions & 0 deletions scalafmt-tests/src/test/resources/trailing-commas/trailingCommasAlwaysSingleLine.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,10 @@ foo(
)
>>>
foo(a)
<<< #3663 tuple
val x = (
"a",
"b",
)
>>>
val x = ("a", "b")
7 changes: 7 additions & 0 deletions scalafmt-tests/src/test/resources/trailing-commas/trailingCommasNeverSingleLine.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,10 @@ foo(
)
>>>
foo(a)
<<< #3663 tuple
val x = (
"a",
"b",
)
>>>
val x = ("a", "b")
10 changes: 10 additions & 0 deletions scalafmt-tests/src/test/resources/trailing-commas/trailingCommasPreserve.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,3 +353,13 @@ object a {
b: Int /* c */
) = a + b
}
<<< #3663 tuple
val x = (
"a",
"b",
)
>>>
val x = (
"a",
"b",
)
Loading