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: unfold yield correctly and consistently #3047

Merged
merged 2 commits into from
Jan 10, 2022
Merged

FormatOps: unfold yield correctly and consistently #3047

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
875b020
Add side-by-side for-yield and for-do tests
kitbellew Jan 9, 2022
5c86a92
FormatOps: unfold yield correctly and consistently
kitbellew Jan 9, 2022
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: 2 additions & 8 deletions 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 @@ -1745,14 +1745,8 @@ class FormatOps(
def slbSplit(end: T)(implicit fileLine: FileLine) =
Split(Space, 0).withSingleLine(end, noSyntaxNL = true)
body match {
case _: Term.ForYield =>
// unfold policy on yield forces a break
// revert it if we are attempting a single line
val noBreakOnYield = Policy.before(expire) {
case Decision(ft, s) if s.isEmpty && ft.right.is[T.KwYield] =>
Seq(Split(Space, 0))
}
slbSplit(expire).andPolicy(noBreakOnYield)
// we force newlines in for/yield
case _: Term.ForYield => Split.ignored
// we force newlines in try/catch/finally
case _: Term.Try | _: Term.TryWithHandler => Split.ignored
// don't tuck curried apply
Expand Down
16 changes: 13 additions & 3 deletions scalafmt-tests/src/test/resources/newlines/source_unfold.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,10 +655,20 @@ def attributes =
maxColumn = 80
===
val attributes =
for (i ← 1 to count)
yield i
for (i ← 1 to count) yield i
>>>
val attributes = for (i ← 1 to count) yield i
val attributes =
for (i ← 1 to count)
yield i
<<< 2.14 val with short for/do
maxColumn = 80
===
val attributes =
for (i ← 1 to count) i * i
>>>
val attributes =
for (i ← 1 to count)
i * i
<<< 2.15 val with literal apply
object a {
val a = b(0x1F, // ID1
Expand Down