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

FormatOps: fix cond between while and do #4139

Merged
merged 2 commits into from
Aug 6, 2024
Merged

FormatOps: fix cond between while and do #4139

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
bc27ee9
Test redundant braces/parens around while-do cond
kitbellew Aug 6, 2024
ad5da9e
FormatOps: fix cond between `while` and `do`
kitbellew Aug 6, 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
3 changes: 2 additions & 1 deletion scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2013,7 +2013,8 @@ class FormatOps(
style: ScalafmtConfig,
): Option[OptionalBracesRegion] = ft.meta.leftOwner match {
case t @ Term.While(b: Term.Block, _)
if !matchingOpt(nft.right).exists(_.end >= b.pos.end) =>
if isMultiStatBlock(b) &&
!matchingOpt(nft.right).exists(_.end >= b.pos.end) =>
Some(new OptionalBracesRegion {
def owner = Some(t)
def splits = Some {
Expand Down
13 changes: 13 additions & 0 deletions scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,19 @@ object a:
while (foo) do
foo
bar
<<< redundant braces and parens around while-do cond
rewrite.rules = [RedundantParens, RedundantBraces]
===
object a:
while ({
i > 0 && foo
}) do {
i -= 1
}
>>>
object a:
while i > 0 && foo
do i -= 1
<<< nested if-else multiple
object a:
val a =
Expand Down
12 changes: 12 additions & 0 deletions scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,18 @@ object a:
while (foo) do
foo
bar
<<< redundant braces and parens around while-do cond
rewrite.rules = [RedundantParens, RedundantBraces]
===
object a:
while ({
i > 0 && foo
}) do {
i -= 1
}
>>>
object a:
while i > 0 && foo do i -= 1
<<< nested if-else multiple
object a:
val a =
Expand Down
15 changes: 15 additions & 0 deletions scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,21 @@ object a:
while (foo) do
foo
bar
<<< redundant braces and parens around while-do cond
rewrite.rules = [RedundantParens, RedundantBraces]
===
object a:
while ({
i > 0 && foo
}) do {
i -= 1
}
>>>
object a:
while
i > 0 && foo
do
i -= 1
<<< nested if-else multiple
object a:
val a =
Expand Down
13 changes: 13 additions & 0 deletions scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,19 @@ object a:
while (foo) do
foo
bar
<<< redundant braces and parens around while-do cond
rewrite.rules = [RedundantParens, RedundantBraces]
===
object a:
while ({
i > 0 && foo
}) do {
i -= 1
}
>>>
object a:
while i > 0 && foo do
i -= 1
<<< nested if-else multiple
object a:
val a =
Expand Down
Loading