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

Router: move up check for no NL after <- enums #4419

Merged
merged 2 commits into from
Oct 9, 2024
Merged

Router: move up check for no NL after <- enums #4419

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
5d3aa3d
Test scala3 for-yield in `()` + forceBeforeAssign
kitbellew Oct 9, 2024
83580f7
Router: move up check for no NL after `<-` enums
kitbellew Oct 9, 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
19 changes: 11 additions & 8 deletions scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2615,6 +2615,16 @@ class Router(formatOps: FormatOps) {
else if (isRightCommentWithBreak(ft))
Seq(CtrlBodySplits.withIndent(Split(Space.orNL(ft), 0), body, endFt))
else if (isJsNative(body)) Seq(Split(Space, 0).withSingleLine(endFt.left))
else if (
style.dialect.allowSignificantIndentation &&
(style.newlines.sourceIgnored || ft.noBreak) && body.parent.exists {
case p: Enumerator.Assign => (p.body eq body) && p.parent.exists {
case pp: Term.EnumeratorsBlock => isEnclosedInParens(pp)
case _ => false
}
case _ => false
}
) Seq(Split(Space, 0).withIndents(spaceIndents))
else if (style.newlines.forceBeforeAssign(ft.meta.leftOwner))
Seq(CtrlBodySplits.withIndent(Split(Newline2x(ft), 0), body, endFt))
else if (style.newlines.shouldForceBeforeMultilineAssign(ft.meta.leftOwner))
Expand Down Expand Up @@ -2717,7 +2727,7 @@ class Router(formatOps: FormatOps) {
if (!style.align.arrowEnumeratorGenerator) Seq.empty
else Seq(Indent(StateColumn, expire, After))
getSplitsDefValEquals(body, endFt, spaceIndents) {
def splits = CtrlBodySplits.get(body, spaceIndents) {
CtrlBodySplits.get(body, spaceIndents) {
if (spaceIndents.nonEmpty) Split(Space, 0).withIndents(spaceIndents)
else {
val noSlb = body match {
Expand All @@ -2729,13 +2739,6 @@ class Router(formatOps: FormatOps) {
else Split(Space, 0).withSingleLine(expire)
}
}(cost => CtrlBodySplits.withIndent(Split(Newline2x(ft), cost), endFt))
body.parent.parent match {
case Some(pp: Term.EnumeratorsBlock)
if style.dialect.allowSignificantIndentation &&
isEnclosedInParens(pp) =>
Seq(Split(Space, 0).withIndents(spaceIndents))
case _ => splits
}
}
}

Expand Down
30 changes: 27 additions & 3 deletions scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3981,7 +3981,8 @@ object a:
object a:
val abstractTypeNames =
for (
parent <- parents;
parent <-
parents;
mbr <- parent.abstractTypeMembers if qualifies(mbr.symbol)
)
yield mbr.name.asTypeName
Expand Down Expand Up @@ -7345,12 +7346,35 @@ object Parsers:
object a:
val expression = for (
x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
z <-
loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
) yield x + y
>>>
object a:
val expression =
for (
x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
z <-
loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
) yield x + y
<<< #4219 forceBeforeAssign
newlines.forceBeforeAssign = any
===
object a:
val expression = for (
x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
z <-
loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
) yield x + y
>>>
object a:
val expression =
for (
x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
z <-
loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
) yield x + y
25 changes: 23 additions & 2 deletions scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_fold.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7066,11 +7066,32 @@ object Parsers:
object a:
val expression = for (
x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
z <-
loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
) yield x + y
>>>
object a:
val expression = for (
x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
z <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
) yield x + y
<<< #4219 forceBeforeAssign
newlines.forceBeforeAssign = any
===
object a:
val expression = for (
x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
z <-
loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
) yield x + y
>>>
object a:
val expression =
for (
x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
z <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
) yield x + y
30 changes: 27 additions & 3 deletions scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_keep.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3942,7 +3942,8 @@ object a:
object a:
val abstractTypeNames =
for (
parent <- parents;
parent <-
parents;
mbr <- parent.abstractTypeMembers if qualifies(mbr.symbol)
)
yield mbr.name.asTypeName
Expand Down Expand Up @@ -7375,11 +7376,34 @@ object Parsers:
object a:
val expression = for (
x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
z <-
loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
) yield x + y
>>>
object a:
val expression = for (
x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
z <-
loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
) yield x + y
<<< #4219 forceBeforeAssign
newlines.forceBeforeAssign = any
===
object a:
val expression = for (
x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
z <-
loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
) yield x + y
>>>
object a:
val expression =
for (
x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
z <-
loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
) yield x + y
26 changes: 24 additions & 2 deletions scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_unfold.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7638,13 +7638,35 @@ object Parsers:
object a:
val expression = for (
x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
z <-
loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
) yield x + y
>>>
object a:
val expression =
for (
x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
z <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
)
yield x + y
<<< #4219 forceBeforeAssign
newlines.forceBeforeAssign = any
===
object a:
val expression = for (
x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
z <-
loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
) yield x + y
>>>
object a:
val expression =
for (
x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
z <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
)
yield x + y
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 @@ -137,7 +137,7 @@ class FormatTests extends FunSuite with CanRunTests with FormatAssertions {
override def afterAll(): Unit = {
logger.debug(s"Total explored: ${Debug.explored}")
if (!onlyUnit && !onlyManual)
assertEquals(Debug.explored, 1785622, "total explored")
assertEquals(Debug.explored, 1785882, "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