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: pass Tuples to argumentStarts as well #4025

Merged
merged 2 commits into from
May 20, 2024
Merged

FormatOps: pass Tuples to argumentStarts as well #4025

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
1d5fb64
Test binpacked tuples, some non-idempotent
kitbellew May 19, 2024
e856c6c
FormatOps: pass Tuples to `argumentStarts` as well
kitbellew May 20, 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
1 change: 1 addition & 0 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 @@ -86,6 +86,7 @@ class FormatOps(
tree match {
case _: Lit.Unit | _: Term.ArgClause | _: Term.ParamClause =>
case t: Member.SyntaxValuesClause => t.values.foreach(add)
case t: Member.Tuple => t.args.foreach(add)
case t: Term.Param => // includes Term.ParamClause
add(t)
t.mods.foreach(addOptional)
Expand Down
100 changes: 99 additions & 1 deletion scalafmt-tests/src/test/resources/newlines/source_classic.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6389,7 +6389,7 @@ object A {
}
}
}
<<< #3369
<<< #3369 always
binPack.defnSite = always
===
object Test {
Expand Down Expand Up @@ -6423,6 +6423,104 @@ object Test {
(source, control, sink, factory)
}
}
<<< #3369 always, source folded
binPack.defnSite = always
===
object Test {
private def
streamProbesWithOffsetFactory(committerSettings: CommitterSettings):
(TestPublisher.Probe[Committable], Consumer.Control, TestSubscriber.Probe[CommittableOffsetBatch], TestOffsetFactory) = {
val (source, control, sink) = streamProbes(committerSettings)
val factory = TestOffsetFactory(new TestBatchCommitter(committerSettings))
(source, control, sink, factory)
}
}
>>>
object Test {
private def streamProbesWithOffsetFactory(
committerSettings: CommitterSettings
): (TestPublisher.Probe[Committable],
Consumer.Control,
TestSubscriber.Probe[
CommittableOffsetBatch
], TestOffsetFactory) = {
val (source, control, sink) =
streamProbes(committerSettings)
val factory = TestOffsetFactory(
new TestBatchCommitter(
committerSettings
)
)
(source, control, sink, factory)
}
}
<<< #3369 oneline
binPack.defnSite = oneline
===
object Test {
private def streamProbesWithOffsetFactory(
committerSettings: CommitterSettings
): (TestPublisher.Probe[Committable],
Consumer.Control,
TestSubscriber.Probe[CommittableOffsetBatch],
TestOffsetFactory) = {
val (source, control, sink) = streamProbes(committerSettings)
val factory = TestOffsetFactory(new TestBatchCommitter(committerSettings))
(source, control, sink, factory)
}
}
>>>
object Test {
private def streamProbesWithOffsetFactory(
committerSettings: CommitterSettings
): (TestPublisher.Probe[Committable],
Consumer.Control,
TestSubscriber.Probe[
CommittableOffsetBatch
],
TestOffsetFactory) = {
val (source, control, sink) =
streamProbes(committerSettings)
val factory = TestOffsetFactory(
new TestBatchCommitter(
committerSettings
)
)
(source, control, sink, factory)
}
}
<<< #3369 oneline, source folded
binPack.defnSite = oneline
===
object Test {
private def
streamProbesWithOffsetFactory(committerSettings: CommitterSettings):
(TestPublisher.Probe[Committable], Consumer.Control, TestSubscriber.Probe[CommittableOffsetBatch], TestOffsetFactory) = {
val (source, control, sink) = streamProbes(committerSettings)
val factory = TestOffsetFactory(new TestBatchCommitter(committerSettings))
(source, control, sink, factory)
}
}
>>>
object Test {
private def streamProbesWithOffsetFactory(
committerSettings: CommitterSettings
): (TestPublisher.Probe[Committable],
Consumer.Control,
TestSubscriber.Probe[
CommittableOffsetBatch
],
TestOffsetFactory) = {
val (source, control, sink) =
streamProbes(committerSettings)
val factory = TestOffsetFactory(
new TestBatchCommitter(
committerSettings
)
)
(source, control, sink, factory)
}
}
<<< SM 4.7.0: 1
object a {
@volatile private var _foo: Bar =
Expand Down
106 changes: 105 additions & 1 deletion scalafmt-tests/src/test/resources/newlines/source_fold.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5917,7 +5917,7 @@ object A {
}
}
}
<<< #3369
<<< #3369 always
binPack.defnSite = always
===
object Test {
Expand Down Expand Up @@ -5953,6 +5953,110 @@ object Test {
(source, control, sink, factory)
}
}
<<< #3369 always, source folded
binPack.defnSite = always
===
object Test {
private def
streamProbesWithOffsetFactory(committerSettings: CommitterSettings):
(TestPublisher.Probe[Committable], Consumer.Control, TestSubscriber.Probe[CommittableOffsetBatch], TestOffsetFactory) = {
val (source, control, sink) = streamProbes(committerSettings)
val factory = TestOffsetFactory(new TestBatchCommitter(committerSettings))
(source, control, sink, factory)
}
}
>>>
object Test {
private def streamProbesWithOffsetFactory(
committerSettings: CommitterSettings
): (
TestPublisher.Probe[Committable],
Consumer.Control,
TestSubscriber.Probe[
CommittableOffsetBatch
], TestOffsetFactory
) = {
val (source, control, sink) =
streamProbes(committerSettings)
val factory = TestOffsetFactory(
new TestBatchCommitter(
committerSettings
)
)
(source, control, sink, factory)
}
}
<<< #3369 oneline
binPack.defnSite = oneline
===
object Test {
private def streamProbesWithOffsetFactory(
committerSettings: CommitterSettings
): (TestPublisher.Probe[Committable],
Consumer.Control,
TestSubscriber.Probe[CommittableOffsetBatch],
TestOffsetFactory) = {
val (source, control, sink) = streamProbes(committerSettings)
val factory = TestOffsetFactory(new TestBatchCommitter(committerSettings))
(source, control, sink, factory)
}
}
>>>
object Test {
private def streamProbesWithOffsetFactory(
committerSettings: CommitterSettings
): (
TestPublisher.Probe[Committable],
Consumer.Control,
TestSubscriber.Probe[
CommittableOffsetBatch
],
TestOffsetFactory
) = {
val (source, control, sink) =
streamProbes(committerSettings)
val factory = TestOffsetFactory(
new TestBatchCommitter(
committerSettings
)
)
(source, control, sink, factory)
}
}
<<< #3369 oneline, source folded
binPack.defnSite = oneline
===
object Test {
private def
streamProbesWithOffsetFactory(committerSettings: CommitterSettings):
(TestPublisher.Probe[Committable], Consumer.Control, TestSubscriber.Probe[CommittableOffsetBatch], TestOffsetFactory) = {
val (source, control, sink) = streamProbes(committerSettings)
val factory = TestOffsetFactory(new TestBatchCommitter(committerSettings))
(source, control, sink, factory)
}
}
>>>
object Test {
private def streamProbesWithOffsetFactory(
committerSettings: CommitterSettings
): (
TestPublisher.Probe[Committable],
Consumer.Control,
TestSubscriber.Probe[
CommittableOffsetBatch
],
TestOffsetFactory
) = {
val (source, control, sink) =
streamProbes(committerSettings)
val factory = TestOffsetFactory(
new TestBatchCommitter(
committerSettings
)
)
(source, control, sink, factory)
}
}
<<< SM 4.7.0: 1
object a {
@volatile private var _foo: Bar =
Expand Down
101 changes: 100 additions & 1 deletion scalafmt-tests/src/test/resources/newlines/source_keep.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6285,7 +6285,7 @@ object A {
}
}
}
<<< #3369
<<< #3369 always
binPack.defnSite = always
===
object Test {
Expand All @@ -6301,6 +6301,38 @@ object Test {
}
}
>>>
object Test {
private def streamProbesWithOffsetFactory(
committerSettings: CommitterSettings
): (TestPublisher.Probe[Committable],
Consumer.Control,
TestSubscriber.Probe[
CommittableOffsetBatch
],
TestOffsetFactory) = {
val (source, control, sink) =
streamProbes(committerSettings)
val factory = TestOffsetFactory(
new TestBatchCommitter(
committerSettings
)
)
(source, control, sink, factory)
}
}
<<< #3369 always, source folded
binPack.defnSite = always
===
object Test {
private def
streamProbesWithOffsetFactory(committerSettings: CommitterSettings):
(TestPublisher.Probe[Committable], Consumer.Control, TestSubscriber.Probe[CommittableOffsetBatch], TestOffsetFactory) = {
val (source, control, sink) = streamProbes(committerSettings)
val factory = TestOffsetFactory(new TestBatchCommitter(committerSettings))
(source, control, sink, factory)
}
}
>>>
object Test {
private def streamProbesWithOffsetFactory(
committerSettings: CommitterSettings
Expand All @@ -6319,6 +6351,73 @@ object Test {
(source, control, sink, factory)
}
}
<<< #3369 oneline
binPack.defnSite = oneline
===
object Test {
private def streamProbesWithOffsetFactory(
committerSettings: CommitterSettings
): (TestPublisher.Probe[Committable],
Consumer.Control,
TestSubscriber.Probe[CommittableOffsetBatch],
TestOffsetFactory) = {
val (source, control, sink) = streamProbes(committerSettings)
val factory = TestOffsetFactory(new TestBatchCommitter(committerSettings))
(source, control, sink, factory)
}
}
>>>
object Test {
private def streamProbesWithOffsetFactory(
committerSettings: CommitterSettings
): (TestPublisher.Probe[Committable],
Consumer.Control,
TestSubscriber.Probe[
CommittableOffsetBatch
],
TestOffsetFactory) = {
val (source, control, sink) =
streamProbes(committerSettings)
val factory = TestOffsetFactory(
new TestBatchCommitter(
committerSettings
)
)
(source, control, sink, factory)
}
}
<<< #3369 oneline, source folded
binPack.defnSite = oneline
===
object Test {
private def
streamProbesWithOffsetFactory(committerSettings: CommitterSettings):
(TestPublisher.Probe[Committable], Consumer.Control, TestSubscriber.Probe[CommittableOffsetBatch], TestOffsetFactory) = {
val (source, control, sink) = streamProbes(committerSettings)
val factory = TestOffsetFactory(new TestBatchCommitter(committerSettings))
(source, control, sink, factory)
}
}
>>>
object Test {
private def streamProbesWithOffsetFactory(
committerSettings: CommitterSettings
): (TestPublisher.Probe[Committable],
Consumer.Control,
TestSubscriber.Probe[
CommittableOffsetBatch
],
TestOffsetFactory) = {
val (source, control, sink) =
streamProbes(committerSettings)
val factory = TestOffsetFactory(
new TestBatchCommitter(
committerSettings
)
)
(source, control, sink, factory)
}
}
<<< SM 4.7.0: 1
object a {
@volatile private var _foo: Bar =
Expand Down
Loading
Loading