mirror of
https://github.com/dart-lang/sdk
synced 2024-10-14 11:42:11 +00:00
Roll the latest dart_style into the SDK.
This contains two small fixes to pattern formatting: - Don't add an extra space to switches with no cases. - Don't indent branches of "||" in switch expressions. Change-Id: Ia40fc36287172d098583f3219f5c6a9c49ba019e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/293121 Commit-Queue: Bob Nystrom <rnystrom@google.com> Auto-Submit: Bob Nystrom <rnystrom@google.com> Reviewed-by: Kevin Moore <kevmoo@google.com>
This commit is contained in:
parent
b0abd310ca
commit
eaea334be1
2
DEPS
2
DEPS
|
@ -133,7 +133,7 @@ vars = {
|
|||
# and land the review.
|
||||
#
|
||||
# For more details, see https://github.com/dart-lang/sdk/issues/30164.
|
||||
"dart_style_rev": "568333db2650e77c0f96ebc77969c9469cf514f0", # disable rev_sdk_deps.dart
|
||||
"dart_style_rev": "33efb2560c62b7b7bf330009cd757495b0e1456a", # disable rev_sdk_deps.dart
|
||||
"dartdoc_rev": "1a7952b13858ed307185a28f9b4ea861c0abb1c5",
|
||||
"ffi_rev": "04fa38ab45cb2957f9059e03031b53906c2c4385",
|
||||
"file_rev": "72a67c33f90bfb7e10057e286e06d2fe3baa4d98",
|
||||
|
|
|
@ -12,5 +12,5 @@ class Circle implements Shape {
|
|||
Circle(this.radius);
|
||||
}
|
||||
|
||||
double calculateArea(Shape shape) => switch (shape) { };
|
||||
double calculateArea(Shape shape) => switch (shape) {};
|
||||
testMain() {}
|
||||
|
|
|
@ -1 +1 @@
|
|||
method(Map m) => switch (m) { };
|
||||
method(Map m) => switch (m) {};
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
void main() {}
|
||||
List<List<A>> subs<A>(List<A> list) => switch (list) { };
|
||||
List<List<A>> perms<A>(List<A> list) => switch (list) { };
|
||||
bool equals<A>(List<A> a, List<A> b) => switch ((a, b)) { };
|
||||
List<List<A>> subs<A>(List<A> list) => switch (list) {};
|
||||
List<List<A>> perms<A>(List<A> list) => switch (list) {};
|
||||
bool equals<A>(List<A> a, List<A> b) => switch ((a, b)) {};
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
void main() {}
|
||||
List<A> f<A>(List<A> list) => switch (list) { };
|
||||
List<List<A>> subs<A>(List<A> list) => switch (list) { };
|
||||
List<List<A>> perms<A>(List<A> list) => switch (list) { };
|
||||
bool equals<A>(List<A> a, List<A> b) => switch ((a, b)) { };
|
||||
List<A> f<A>(List<A> list) => switch (list) {};
|
||||
List<List<A>> subs<A>(List<A> list) => switch (list) {};
|
||||
List<List<A>> perms<A>(List<A> list) => switch (list) {};
|
||||
bool equals<A>(List<A> a, List<A> b) => switch ((a, b)) {};
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
void main() {}
|
||||
List<List<A>> subs<A>(List<A> list) => switch (list) { };
|
||||
List<List<A>> subs<A>(List<A> list) => switch (list) {};
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
void main() {}
|
||||
List<List<A>> subs<A>(List<A> list) => switch (list) { };
|
||||
List<List<A>> perms<A>(List<A> list) => switch (list) { };
|
||||
bool equals<A>(List<A> a, List<A> b) => switch ((a, b)) { };
|
||||
List<List<A>> subs<A>(List<A> list) => switch (list) {};
|
||||
List<List<A>> perms<A>(List<A> list) => switch (list) {};
|
||||
bool equals<A>(List<A> a, List<A> b) => switch ((a, b)) {};
|
||||
|
|
|
@ -1,22 +1,22 @@
|
|||
exhaustive(List<num> list) => switch (list) { };
|
||||
exhaustive1a(List<num> list) => switch (list) { };
|
||||
exhaustive1b(List<num> list) => switch (list) { };
|
||||
exhaustive2a(List<num> list) => switch (list) { };
|
||||
exhaustive2b(List<num> list) => switch (list) { };
|
||||
exhaustive2c(List<num> list) => switch (list) { };
|
||||
nonExhaustive1aMissing(List<num> list) => switch (list) { };
|
||||
nonExhaustive1bMissing(List<num> list) => switch (list) { };
|
||||
nonExhaustive2aMissing(List<num> list) => switch (list) { };
|
||||
nonExhaustive2bMissing(List<num> list) => switch (list) { };
|
||||
nonExhaustive2cMissing(List<num> list) => switch (list) { };
|
||||
nonExhaustiveRestrictedType(List<num> list) => switch (list) { };
|
||||
nonExhaustive1aRestrictedValue(List<num> list) => switch (list) { };
|
||||
nonExhaustive1aRestrictedType(List<num> list) => switch (list) { };
|
||||
nonExhaustive1bRestrictedValue(List<num> list) => switch (list) { };
|
||||
nonExhaustive1bRestrictedType(List<num> list) => switch (list) { };
|
||||
nonExhaustive2aRestrictedValue(List<num> list) => switch (list) { };
|
||||
nonExhaustive2bRestrictedValue(List<num> list) => switch (list) { };
|
||||
nonExhaustive2cRestrictedValue(List<num> list) => switch (list) { };
|
||||
nonExhaustive2dRestrictedValue(List<num> list) => switch (list) { };
|
||||
nonExhaustive2eRestrictedValue(List<num> list) => switch (list) { };
|
||||
nonExhaustive2fRestrictedValue(List<num> list) => switch (list) { };
|
||||
exhaustive(List<num> list) => switch (list) {};
|
||||
exhaustive1a(List<num> list) => switch (list) {};
|
||||
exhaustive1b(List<num> list) => switch (list) {};
|
||||
exhaustive2a(List<num> list) => switch (list) {};
|
||||
exhaustive2b(List<num> list) => switch (list) {};
|
||||
exhaustive2c(List<num> list) => switch (list) {};
|
||||
nonExhaustive1aMissing(List<num> list) => switch (list) {};
|
||||
nonExhaustive1bMissing(List<num> list) => switch (list) {};
|
||||
nonExhaustive2aMissing(List<num> list) => switch (list) {};
|
||||
nonExhaustive2bMissing(List<num> list) => switch (list) {};
|
||||
nonExhaustive2cMissing(List<num> list) => switch (list) {};
|
||||
nonExhaustiveRestrictedType(List<num> list) => switch (list) {};
|
||||
nonExhaustive1aRestrictedValue(List<num> list) => switch (list) {};
|
||||
nonExhaustive1aRestrictedType(List<num> list) => switch (list) {};
|
||||
nonExhaustive1bRestrictedValue(List<num> list) => switch (list) {};
|
||||
nonExhaustive1bRestrictedType(List<num> list) => switch (list) {};
|
||||
nonExhaustive2aRestrictedValue(List<num> list) => switch (list) {};
|
||||
nonExhaustive2bRestrictedValue(List<num> list) => switch (list) {};
|
||||
nonExhaustive2cRestrictedValue(List<num> list) => switch (list) {};
|
||||
nonExhaustive2dRestrictedValue(List<num> list) => switch (list) {};
|
||||
nonExhaustive2eRestrictedValue(List<num> list) => switch (list) {};
|
||||
nonExhaustive2fRestrictedValue(List<num> list) => switch (list) {};
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
typedef Nullable = Object?;
|
||||
exhaustiveByValue(Null n) => switch (n) { };
|
||||
exhaustiveByType(Null n) => switch (n) { };
|
||||
exhaustiveWithField(Null n) => switch (n) { };
|
||||
nonExhaustiveRestrictedField(Null n) => switch (n) { };
|
||||
exhaustiveNullable(Object? o) => switch (o) { };
|
||||
nonExhaustiveNullable(Object? o) => switch (o) { };
|
||||
nonExhaustiveNullableRestricted(Object? o) => switch (o) { };
|
||||
exhaustiveByValue(Null n) => switch (n) {};
|
||||
exhaustiveByType(Null n) => switch (n) {};
|
||||
exhaustiveWithField(Null n) => switch (n) {};
|
||||
nonExhaustiveRestrictedField(Null n) => switch (n) {};
|
||||
exhaustiveNullable(Object? o) => switch (o) {};
|
||||
nonExhaustiveNullable(Object? o) => switch (o) {};
|
||||
nonExhaustiveNullableRestricted(Object? o) => switch (o) {};
|
||||
|
|
|
@ -4,9 +4,9 @@ class A {
|
|||
A(this.field1, this.field2);
|
||||
}
|
||||
|
||||
exhaustiveDirect(A a) => switch (a) { };
|
||||
exhaustiveWithWildcards(A a) => switch (a) { };
|
||||
exhaustiveWithFields(A a) => switch (a) { };
|
||||
exhaustiveWithTypedFields(A a) => switch (a) { };
|
||||
nonExhaustiveFixedField(A a) => switch (a) { };
|
||||
nonExhaustiveTypedField(A a) => switch (a) { };
|
||||
exhaustiveDirect(A a) => switch (a) {};
|
||||
exhaustiveWithWildcards(A a) => switch (a) {};
|
||||
exhaustiveWithFields(A a) => switch (a) {};
|
||||
exhaustiveWithTypedFields(A a) => switch (a) {};
|
||||
nonExhaustiveFixedField(A a) => switch (a) {};
|
||||
nonExhaustiveTypedField(A a) => switch (a) {};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
exhaustiveWildcard((int, String, {bool named}) r) => switch (r) { };
|
||||
exhaustiveTyped((int, String, {bool named}) r) => switch (r) { };
|
||||
exhaustiveValue((int, String, {bool named}) r) => switch (r) { };
|
||||
nonExhaustiveRestrictedValue1((int, String, {bool named}) r) => switch (r) { };
|
||||
nonExhaustiveRestrictedValue2((int, String, {bool named}) r) => switch (r) { };
|
||||
nonExhaustiveRestrictedValue3((int, String, {bool named}) r) => switch (r) { };
|
||||
exhaustiveWildcard((int, String, {bool named}) r) => switch (r) {};
|
||||
exhaustiveTyped((int, String, {bool named}) r) => switch (r) {};
|
||||
exhaustiveValue((int, String, {bool named}) r) => switch (r) {};
|
||||
nonExhaustiveRestrictedValue1((int, String, {bool named}) r) => switch (r) {};
|
||||
nonExhaustiveRestrictedValue2((int, String, {bool named}) r) => switch (r) {};
|
||||
nonExhaustiveRestrictedValue3((int, String, {bool named}) r) => switch (r) {};
|
||||
|
|
|
@ -10,6 +10,6 @@ extension on I {
|
|||
int get member => 42;
|
||||
}
|
||||
|
||||
method(A a) => switch (a) { };
|
||||
method(A a) => switch (a) {};
|
||||
main() {}
|
||||
expect(expected, actual) {}
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
int f<A>() => switch (unknownName) { };
|
||||
int f<A>() => switch (unknownName) {};
|
||||
void main() {}
|
||||
|
|
|
@ -27,6 +27,6 @@ class MyMap<K, V> extends MapBase<K, V> {
|
|||
}
|
||||
|
||||
String test1(Object o) {}
|
||||
String test2(Object o) => switch (o) { };
|
||||
String test2(Object o) => switch (o) {};
|
||||
main() {}
|
||||
expect(expected, actual) {}
|
||||
|
|
|
@ -9,6 +9,6 @@ class NegativeLengthList<E> with ListMixin<E> {
|
|||
void operator []=(int index, E value) {}
|
||||
}
|
||||
|
||||
int switchList(List<int> list) => switch (list) { };
|
||||
int switchList(List<int> list) => switch (list) {};
|
||||
main() {}
|
||||
expect(expected, actual) {}
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
String test1(List<int> v) {}
|
||||
String test2(List<int> v) {}
|
||||
String test3(List<int> v) => switch (v) { };
|
||||
String test3(List<int> v) => switch (v) {};
|
||||
|
|
|
@ -16,6 +16,6 @@ class Circle implements Shape {
|
|||
double calculateArea() => math.pi * radius * radius;
|
||||
}
|
||||
|
||||
double calculateArea(Shape shape) => switch (shape) { };
|
||||
double calculateArea(Shape shape) => switch (shape) {};
|
||||
main() {}
|
||||
expect(expected, actual) {}
|
||||
|
|
|
@ -1 +1 @@
|
|||
f(x) => switch (x) { };
|
||||
f(x) => switch (x) {};
|
||||
|
|
|
@ -1 +1 @@
|
|||
f(x) => switch (x) { };
|
||||
f(x) => switch (x) {};
|
||||
|
|
|
@ -1 +1 @@
|
|||
f(x) => switch (x) { };
|
||||
f(x) => switch (x) {};
|
||||
|
|
|
@ -1 +1 @@
|
|||
f(x) => switch (x) { };
|
||||
f(x) => switch (x) {};
|
||||
|
|
|
@ -1 +1 @@
|
|||
f(x) => switch (x) { };
|
||||
f(x) => switch (x) {};
|
||||
|
|
|
@ -5,9 +5,9 @@ class Circle {
|
|||
Circle(this.radius);
|
||||
}
|
||||
|
||||
test1(dynamic x) => switch (x) { };
|
||||
test1(dynamic x) => switch (x) {};
|
||||
dynamic Function(dynamic)? captured;
|
||||
test2(dynamic x) => switch (x) { };
|
||||
test2(dynamic x) => switch (x) {};
|
||||
test3(dynamic x) {}
|
||||
main() {}
|
||||
expectEquals(x, y) {}
|
||||
|
|
|
@ -1,3 +1,2 @@
|
|||
void main() {}
|
||||
Iterable<(Iterable<A>, Iterable<A>)> split<A>(Iterable<A> it) =>
|
||||
switch (it) { };
|
||||
Iterable<(Iterable<A>, Iterable<A>)> split<A>(Iterable<A> it) => switch (it) {};
|
||||
|
|
Loading…
Reference in a new issue