Skip to content

Commit 200e0c8

Browse files
munificentCommit Queue
authored andcommitted
Reformat tests/language/r** using the 3.8 style.
Change-Id: Ibfa8df8eb3cdeec9afd45fa8448a7186869ae2c4 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/425345 Reviewed-by: Lasse Nielsen <[email protected]> Auto-Submit: Bob Nystrom <[email protected]> Commit-Queue: Lasse Nielsen <[email protected]>
1 parent 1ba6da2 commit 200e0c8

File tree

121 files changed

+880
-856
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+880
-856
lines changed

tests/language/records/simple/constants_and_field_access_test.dart

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@ void checkRecordP2(Object? e1, Object? e2, (Object?, Object?) r) {
1212
Expect.equals(e2, r.$2);
1313
}
1414

15-
void checkRecordP3(Object? e1, Object? e2, Object? e3,
16-
(Object? e1, Object? e2, Object? e3) r) {
15+
void checkRecordP3(
16+
Object? e1,
17+
Object? e2,
18+
Object? e3,
19+
(Object? e1, Object? e2, Object? e3) r,
20+
) {
1721
Expect.equals(e1, r.$1);
1822
Expect.equals(e2, r.$2);
1923
Expect.equals(e3, r.$3);
@@ -28,8 +32,12 @@ void checkRecordN2(Object? foo, Object? bar, ({Object? foo, Object? bar}) r) {
2832
Expect.equals(bar, r.bar);
2933
}
3034

31-
void checkRecordN3(Object? foo, Object? bar, Object? baz,
32-
({Object? foo, Object? bar, Object? baz}) r) {
35+
void checkRecordN3(
36+
Object? foo,
37+
Object? bar,
38+
Object? baz,
39+
({Object? foo, Object? bar, Object? baz}) r,
40+
) {
3341
Expect.equals(foo, r.foo);
3442
Expect.equals(bar, r.bar);
3543
Expect.equals(baz, r.baz);
@@ -41,27 +49,25 @@ void checkRecordP1N1(Object? e1, Object? foo, (Object?, {Object? foo}) r) {
4149
}
4250

4351
void checkRecordP1N2(
44-
Object? e1,
45-
Object? foo,
46-
Object? bar,
47-
(
48-
Object? e1, {
49-
Object? foo,
50-
Object? bar,
51-
}) r) {
52+
Object? e1,
53+
Object? foo,
54+
Object? bar,
55+
(Object? e1, {Object? foo, Object? bar}) r,
56+
) {
5257
Expect.equals(e1, r.$1);
5358
Expect.equals(foo, r.foo);
5459
Expect.equals(bar, r.bar);
5560
}
5661

5762
void checkRecordP3N3(
58-
Object? e1,
59-
Object? e2,
60-
Object? e3,
61-
Object? foo,
62-
Object? bar,
63-
Object? baz,
64-
(Object?, Object?, Object?, {Object? foo, Object? baz, Object? bar}) r) {
63+
Object? e1,
64+
Object? e2,
65+
Object? e3,
66+
Object? foo,
67+
Object? bar,
68+
Object? baz,
69+
(Object?, Object?, Object?, {Object? foo, Object? baz, Object? bar}) r,
70+
) {
6571
Expect.equals(bar, r.bar);
6672
Expect.equals(foo, r.foo);
6773
Expect.equals(baz, r.baz);
@@ -92,7 +98,10 @@ main() {
9298
checkRecordN1(const [1, 2, 3], const (foo: [1, 2, 3]));
9399

94100
checkRecordN2(
95-
const {1, 2, 3}, const A(20), const (foo: const {1, 2, 3}, bar: A(20)));
101+
const {1, 2, 3},
102+
const A(20),
103+
const (foo: const {1, 2, 3}, bar: A(20)),
104+
);
96105

97106
checkRecordN3(A(10), 1.0, 42, const (foo: A(10), bar: 1.0, baz: 40 + 2));
98107

@@ -101,18 +110,12 @@ main() {
101110
checkRecordP1N2(A(1), A(2), A(3), const (foo: A(2), A(1), bar: A(3)));
102111

103112
checkRecordP3N3(
104-
1,
105-
2.0,
106-
'hey',
107-
A(10),
108-
const A(20),
109-
const ['hi'],
110-
const (
111-
2 - 1,
112-
2.0,
113-
'h' + 'ey',
114-
foo: A(3 + 7),
115-
baz: ['hi'],
116-
bar: A(10 * 2),
117-
));
113+
1,
114+
2.0,
115+
'hey',
116+
A(10),
117+
const A(20),
118+
const ['hi'],
119+
const (2 - 1, 2.0, 'h' + 'ey', foo: A(3 + 7), baz: ['hi'], bar: A(10 * 2)),
120+
);
118121
}

tests/language/records/simple/dynamic_field_access_test.dart

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ dynamic r3 = runtimeTrue
2828
? const (10, 'a', foo: [1], bar: (50, baz: 60)) as dynamic
2929
: A();
3030
dynamic r4 = runtimeTrue ? (foo1, foo2: foo2) as dynamic : A();
31-
dynamic r5 =
32-
runtimeTrue ? (10, $2: 20, $1000000000000000000: 'meow') as dynamic : A();
31+
dynamic r5 = runtimeTrue
32+
? (10, $2: 20, $1000000000000000000: 'meow') as dynamic
33+
: A();
3334

3435
main() {
3536
Expect.equals(2, r1.$1);
@@ -38,7 +39,8 @@ main() {
3839
Expect.throwsNoSuchMethodError(() => r1.$4);
3940
Expect.throwsNoSuchMethodError(() => r1.$10000000000);
4041
Expect.throwsNoSuchMethodError(
41-
() => r1.$99999999999999999999999999999999999999999999999);
42+
() => r1.$99999999999999999999999999999999999999999999999,
43+
);
4244
Expect.throwsNoSuchMethodError(() => r1.foo);
4345
Expect.equals((2, 3).toString(), r1.toString());
4446
Expect.throwsNoSuchMethodError(() {

tests/language/records/simple/equals_and_hashcode_test.dart

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,14 @@ checkNotEquals(Object? a, Object? b) {
4646
main() {
4747
checkEqualsAndHash((1, 2), (1, 2));
4848
checkEqualsAndHash((1, 2), const (1, 2));
49-
checkEqualsAndHash(const (42, foo: "hello3"),
50-
(foo: "hello${int.parse("3")}", 40 + int.parse("2")));
51-
checkEqualsAndHash((1, 2, 3, foo: 4, bar: 5, baz: 6),
52-
(baz: 6, 1, bar: 5, 2, foo: 4, int.parse("3")));
49+
checkEqualsAndHash(
50+
const (42, foo: "hello3"),
51+
(foo: "hello${int.parse("3")}", 40 + int.parse("2")),
52+
);
53+
checkEqualsAndHash(
54+
(1, 2, 3, foo: 4, bar: 5, baz: 6),
55+
(baz: 6, 1, bar: 5, 2, foo: 4, int.parse("3")),
56+
);
5357
checkEqualsAndHash((foo: 1, 2), (2, foo: 1));
5458
checkEqualsAndHash((foo: 3), (foo: 3));
5559

tests/language/records/simple/literals_and_field_access_test.dart

Lines changed: 49 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@ void checkRecordP2(Object? e1, Object? e2, (Object?, Object?) r) {
99
Expect.equals(e2, r.$2);
1010
}
1111

12-
void checkRecordP3(Object? e1, Object? e2, Object? e3,
13-
(Object? e1, Object? e2, Object? e3) r) {
12+
void checkRecordP3(
13+
Object? e1,
14+
Object? e2,
15+
Object? e3,
16+
(Object? e1, Object? e2, Object? e3) r,
17+
) {
1418
Expect.equals(e1, r.$1);
1519
Expect.equals(e2, r.$2);
1620
Expect.equals(e3, r.$3);
@@ -25,8 +29,12 @@ void checkRecordN2(Object? foo, Object? bar, ({Object? foo, Object? bar}) r) {
2529
Expect.equals(bar, r.bar);
2630
}
2731

28-
void checkRecordN3(Object? foo, Object? bar, Object? baz,
29-
({Object? foo, Object? bar, Object? baz}) r) {
32+
void checkRecordN3(
33+
Object? foo,
34+
Object? bar,
35+
Object? baz,
36+
({Object? foo, Object? bar, Object? baz}) r,
37+
) {
3038
Expect.equals(foo, r.foo);
3139
Expect.equals(bar, r.bar);
3240
Expect.equals(baz, r.baz);
@@ -38,27 +46,25 @@ void checkRecordP1N1(Object? e1, Object? foo, (Object?, {Object? foo}) r) {
3846
}
3947

4048
void checkRecordP1N2(
41-
Object? e1,
42-
Object? foo,
43-
Object? bar,
44-
(
45-
Object? e1, {
46-
Object? foo,
47-
Object? bar,
48-
}) r) {
49+
Object? e1,
50+
Object? foo,
51+
Object? bar,
52+
(Object? e1, {Object? foo, Object? bar}) r,
53+
) {
4954
Expect.equals(e1, r.$1);
5055
Expect.equals(foo, r.foo);
5156
Expect.equals(bar, r.bar);
5257
}
5358

5459
void checkRecordP3N3(
55-
Object? e1,
56-
Object? e2,
57-
Object? e3,
58-
Object? foo,
59-
Object? bar,
60-
Object? baz,
61-
(Object?, Object?, Object?, {Object? foo, Object? baz, Object? bar}) r) {
60+
Object? e1,
61+
Object? e2,
62+
Object? e3,
63+
Object? foo,
64+
Object? bar,
65+
Object? baz,
66+
(Object?, Object?, Object?, {Object? foo, Object? baz, Object? bar}) r,
67+
) {
6268
Expect.equals(bar, r.bar);
6369
Expect.equals(foo, r.foo);
6470
Expect.equals(baz, r.baz);
@@ -76,28 +82,24 @@ void checkRecordP3N3(
7682
return getP1N1Rec(n - 1, x, y);
7783
}
7884

79-
(
80-
dynamic,
81-
dynamic,
82-
dynamic, {
83-
dynamic foo,
84-
dynamic bar,
85-
dynamic baz,
86-
}) getP3N3(int i, String s) {
85+
(dynamic, dynamic, dynamic, {dynamic foo, dynamic bar, dynamic baz}) getP3N3(
86+
int i,
87+
String s,
88+
) {
8789
(dynamic, dynamic, {dynamic foo, dynamic qq, dynamic baz}) r1 = (
8890
s.substring(i, i + 1),
8991
s.substring(i, i + 2),
9092
foo: s.substring(i, i + 4),
9193
qq: i,
92-
baz: s.substring(i, i + 6)
94+
baz: s.substring(i, i + 6),
9395
);
9496
(dynamic, dynamic, dynamic, {dynamic foo, dynamic bar, dynamic baz}) r2 = (
9597
r1.$1,
9698
r1.$2,
9799
s.substring(i, i + 3),
98100
foo: r1.foo,
99101
bar: s.substring(i, i + 5),
100-
baz: r1.baz
102+
baz: r1.baz,
101103
);
102104
return r2;
103105
}
@@ -116,16 +118,28 @@ main() {
116118
final x = [1, 2, 3];
117119
checkRecordN1(x, getN1(x));
118120

119-
checkRecordN2("0 1 2", "[1, 2, 3]",
120-
(foo: [for (int i = 0; i < 3; ++i) i].join(' '), bar: x.toString()));
121+
checkRecordN2("0 1 2", "[1, 2, 3]", (
122+
foo: [for (int i = 0; i < 3; ++i) i].join(' '),
123+
bar: x.toString(),
124+
));
121125

122-
checkRecordN3(
123-
A(10), 1.0, 42, (foo: A(9 + int.parse("1")), bar: 1.0, baz: 40 + A(2).v));
126+
checkRecordN3(A(10), 1.0, 42, (
127+
foo: A(9 + int.parse("1")),
128+
bar: 1.0,
129+
baz: 40 + A(2).v,
130+
));
124131

125132
checkRecordP1N1(10, "abc", getP1N1(10, "abc"));
126133

127134
checkRecordP1N2(A(1), A(2), A(3), (foo: A(2), A(1), bar: A(3)));
128135

129-
checkRecordP3N3("h", "he", "hel", "hell", "hello", "hello,",
130-
[for (int i = 0; i < 3; ++i) getP3N3(i, "hello, world")][0]);
136+
checkRecordP3N3(
137+
"h",
138+
"he",
139+
"hel",
140+
"hell",
141+
"hello",
142+
"hello,",
143+
[for (int i = 0; i < 3; ++i) getP3N3(i, "hello, world")][0],
144+
);
131145
}

tests/language/records/simple/runtime_type_test.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ main() {
4141
Expect.equals(getType2<(B, A)>(), getType1((b1, a3)));
4242
Expect.equals(getType2<({A bar, B foo})>(), getType1((foo: b1, bar: a2)));
4343
Expect.equals(
44-
getType2<(A, B, {A bar, B foo})>(), getType1((a1, foo: b1, b2, bar: a2)));
44+
getType2<(A, B, {A bar, B foo})>(),
45+
getType1((a1, foo: b1, b2, bar: a2)),
46+
);
4547

4648
testRuntimeTypeEquality(true, (a1, a2), (a3, a4));
4749
testRuntimeTypeEquality(false, (a1, a2), (a1, a2, a3));

tests/language/records/simple/to_string_test.dart

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,16 @@ main() {
2626
Expect.equals("(1, foo: 2)", (foo: 2, 1).toString());
2727

2828
Expect.equals(
29-
"(1, abc, bar: 3, foo: 2)", (1, foo: 2, "abc", bar: 3).toString());
29+
"(1, abc, bar: 3, foo: 2)",
30+
(1, foo: 2, "abc", bar: 3).toString(),
31+
);
3032

3133
Expect.equals(
32-
"((A1, A2), (foo: A3), (A7, bar: A5, baz: A6, foo: A4))",
33-
(
34-
(A("A1"), A("A2")),
35-
const (foo: A("A3")),
36-
(foo: A("A4"), bar: A("A5"), baz: A("A6"), A("A7"))
37-
)
38-
.toString());
34+
"((A1, A2), (foo: A3), (A7, bar: A5, baz: A6, foo: A4))",
35+
(
36+
(A("A1"), A("A2")),
37+
const (foo: A("A3")),
38+
(foo: A("A4"), bar: A("A5"), baz: A("A6"), A("A7")),
39+
).toString(),
40+
);
3941
}

tests/language/records/simple/type_checks2_test.dart

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ class D2 implements C {
2727
}
2828

2929
B<(num, num)> b1 = (int.parse('1') == 1) ? B<(int, int)>() : B<(num, num)>();
30-
B<({num foo})?> b2 =
31-
(int.parse('1') == 1) ? B<({int foo})>() : B<({num foo})?>();
32-
B<(num?, {num? foo})?> b3 =
33-
(int.parse('1') == 1) ? B<(int, {int? foo})?>() : B<(num?, {num? foo})?>();
30+
B<({num foo})?> b2 = (int.parse('1') == 1)
31+
? B<({int foo})>()
32+
: B<({num foo})?>();
33+
B<(num?, {num? foo})?> b3 = (int.parse('1') == 1)
34+
? B<(int, {int? foo})?>()
35+
: B<(num?, {num? foo})?>();
3436
C d1 = (int.parse('1') == 1) ? D1() : C();
3537
C d2 = (int.parse('1') == 1) ? D2() : C();
3638

tests/language/records/simple/type_checks3_test.dart

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ class B<T> {
1515
}
1616

1717
B<(num, num)> b1 = (int.parse('1') == 1) ? B<(int, int)>() : B<(num, num)>();
18-
B<({num foo})?> b2 =
19-
(int.parse('1') == 1) ? B<({int foo})>() : B<({num foo})?>();
20-
B<(num?, {num? foo})?> b3 =
21-
(int.parse('1') == 1) ? B<(int, {int? foo})?>() : B<(num?, {num? foo})?>();
18+
B<({num foo})?> b2 = (int.parse('1') == 1)
19+
? B<({int foo})>()
20+
: B<({num foo})?>();
21+
B<(num?, {num? foo})?> b3 = (int.parse('1') == 1)
22+
? B<(int, {int? foo})?>()
23+
: B<(num?, {num? foo})?>();
2224

2325
doTests() {
2426
b1 as B<(int, int)>;

0 commit comments

Comments
 (0)