Skip to content

Commit

Permalink
Add more variants in tests for binPack.callSite
Browse files Browse the repository at this point in the history
  • Loading branch information
@kitbellew
kitbellew committed Apr 12, 2024
1 parent 150e5cd commit f58f91d
Show file tree
Hide file tree
Showing 4 changed files with 314 additions and 4 deletions.
139 changes: 135 additions & 4 deletions scalafmt-tests/src/test/resources/newlines/source_classic.stat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2857,7 +2857,44 @@ object a {
|}""".stripMargin
)
}
<<< binPack with named parameter values, danglingParentheses
<<< binPack with named parameter values, configStyleArguments + danglingParentheses
binPack.preset = true
optIn.configStyleArguments = true
danglingParentheses.callSite = true
===
object a {
val foo = bar.map(x =>
x.copy(baz =
Option.when(false)(x.qux)
)
)
}
>>>
object a {
val foo = bar.map(x =>
x.copy(
baz = Option.when(false)(x.qux))
)
}
<<< binPack with named parameter values, configStyleArguments + !danglingParentheses
binPack.preset = true
optIn.configStyleArguments = true
danglingParentheses.callSite = false
===
object a {
val foo = bar.map(x =>
x.copy(baz =
Option.when(false)(x.qux)
)
)
}
>>>
object a {
val foo = bar.map(x =>
x.copy(
baz = Option.when(false)(x.qux)))
}
<<< binPack with named parameter values, !configStyleArguments + danglingParentheses
binPack.preset = true
optIn.configStyleArguments = false
danglingParentheses.callSite = true
Expand All @@ -2877,7 +2914,7 @@ object a {
)
)
}
<<< binPack with named parameter values, !danglingParentheses
<<< binPack with named parameter values, !configStyleArguments + !danglingParentheses
binPack.preset = true
optIn.configStyleArguments = false
danglingParentheses.callSite = false
Expand All @@ -2895,7 +2932,45 @@ object a {
x.copy(
baz = Option.when(false)(x.qux)))
}
<<< literalsIncludeSimpleExpr with named parameter values, danglingParentheses
<<< literalsIncludeSimpleExpr with named parameter values, configStyleArguments + danglingParentheses
binPack.literalsIncludeSimpleExpr = true
optIn.configStyleArguments = true
danglingParentheses.callSite = true
===
object a {
val foo = bar.map(x =>
x.copy(baz =
Option.when(false)(x.qux)
)
)
}
>>>
object a {
val foo = bar.map(x =>
x.copy(baz =
Option.when(false)(x.qux)
)
)
}
<<< literalsIncludeSimpleExpr with named parameter values, configStyleArguments + !danglingParentheses
binPack.literalsIncludeSimpleExpr = true
optIn.configStyleArguments = true
danglingParentheses.callSite = false
===
object a {
val foo = bar.map(x =>
x.copy(baz =
Option.when(false)(x.qux)
)
)
}
>>>
object a {
val foo = bar.map(x =>
x.copy(baz =
Option.when(false)(x.qux)))
}
<<< literalsIncludeSimpleExpr with named parameter values, !configStyleArguments + danglingParentheses
binPack.literalsIncludeSimpleExpr = true
optIn.configStyleArguments = false
danglingParentheses.callSite = true
Expand All @@ -2915,7 +2990,7 @@ object a {
)
)
}
<<< literalsIncludeSimpleExpr with named parameter values, !danglingParentheses
<<< literalsIncludeSimpleExpr with named parameter values, !configStyleArguments + !danglingParentheses
binPack.literalsIncludeSimpleExpr = true
optIn.configStyleArguments = false
danglingParentheses.callSite = false
Expand Down Expand Up @@ -7492,6 +7567,14 @@ object Main {
10000,
10001, 10002 + 0
)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0
)
val bar1 = foo1(
10000,
10001, 10002 + 0)
val bar2 = foo2(
0,
1, 2, 3,
Expand All @@ -7504,6 +7587,12 @@ object Main {
10001,
10002 + 0
)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar2 = foo2(
0,
1,
Expand Down Expand Up @@ -7563,13 +7652,27 @@ object Main {
10000,
10001, 10002 + 0
)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0
)
val bar1 = foo1(
10000,
10001, 10002 + 0)
val bar2 = foo2(
0,
1, 2, 3,
4, 5, 6, 7, 8, 9, 10 + 0)
}
>>>
object Main {
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar2 = foo2(0, 1, 2, 3,
Expand Down Expand Up @@ -7621,6 +7724,14 @@ object Main {
10000,
10001, 10002 + 0
)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0
)
val bar1 = foo1(
10000,
10001, 10002 + 0)
val bar2 = foo2(
0,
1, 2, 3,
Expand All @@ -7633,6 +7744,12 @@ object Main {
10001,
10002 + 0
)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar2 = foo2(
0,
1,
Expand Down Expand Up @@ -7692,13 +7809,27 @@ object Main {
10000,
10001, 10002 + 0
)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0
)
val bar1 = foo1(
10000,
10001, 10002 + 0)
val bar2 = foo2(
0,
1, 2, 3,
4, 5, 6, 7, 8, 9, 10 + 0)
}
>>>
object Main {
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar2 = foo2(0, 1, 2, 3,
Expand Down
56 changes: 56 additions & 0 deletions scalafmt-tests/src/test/resources/newlines/source_fold.stat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7145,13 +7145,27 @@ object Main {
10000,
10001, 10002 + 0
)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0
)
val bar1 = foo1(
10000,
10001, 10002 + 0)
val bar2 = foo2(
0,
1, 2, 3,
4, 5, 6, 7, 8, 9, 10 + 0)
}
>>>
object Main {
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar2 = foo2(
Expand Down Expand Up @@ -7214,13 +7228,27 @@ object Main {
10000,
10001, 10002 + 0
)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0
)
val bar1 = foo1(
10000,
10001, 10002 + 0)
val bar2 = foo2(
0,
1, 2, 3,
4, 5, 6, 7, 8, 9, 10 + 0)
}
>>>
object Main {
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar2 = foo2(
Expand Down Expand Up @@ -7274,13 +7302,27 @@ object Main {
10000,
10001, 10002 + 0
)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0
)
val bar1 = foo1(
10000,
10001, 10002 + 0)
val bar2 = foo2(
0,
1, 2, 3,
4, 5, 6, 7, 8, 9, 10 + 0)
}
>>>
object Main {
val bar1 = foo1(
10000, 10001, 10002 + 0)
val bar1 = foo1(
10000, 10001, 10002 + 0)
val bar1 = foo1(
10000, 10001, 10002 + 0)
val bar1 = foo1(
10000, 10001, 10002 + 0)
val bar2 = foo2(
Expand Down Expand Up @@ -7340,13 +7382,27 @@ object Main {
10000,
10001, 10002 + 0
)
val bar1 = foo1(10000,
10001, 10002 + 0)
val bar1 = foo1(10000,
10001, 10002 + 0
)
val bar1 = foo1(
10000,
10001, 10002 + 0)
val bar2 = foo2(
0,
1, 2, 3,
4, 5, 6, 7, 8, 9, 10 + 0)
}
>>>
object Main {
val bar1 = foo1(
10000, 10001, 10002 + 0)
val bar1 = foo1(
10000, 10001, 10002 + 0)
val bar1 = foo1(
10000, 10001, 10002 + 0)
val bar1 = foo1(
10000, 10001, 10002 + 0)
val bar2 = foo2(
Expand Down
Loading

0 comments on commit f58f91d

Please sign in to comment.