Skip to content

Commit 1097818

Browse files
jcollins-gjcollins-g
committed
dartfmt
1 parent c4a569b commit 1097818

19 files changed

+49
-48
lines changed

‎lib/src/model/model_element.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,8 +548,7 @@ abstract class ModelElement extends Canonicalization
548548
}
549549

550550
bool get isCallable =>
551-
element is FunctionTypedElement ||
552-
element is FunctionTypeAliasElement;
551+
element is FunctionTypedElement || element is FunctionTypeAliasElement;
553552

554553
ModelElement buildCanonicalModelElement() {
555554
Container preferredClass;

‎lib/src/model/typedef.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import 'package:dartdoc/src/render/typedef_renderer.dart';
1010
class Typedef extends ModelElement
1111
with TypeParameters, Categorization
1212
implements EnclosedElement {
13-
Typedef(TypeAliasElement element, Library library,
14-
PackageGraph packageGraph)
13+
Typedef(TypeAliasElement element, Library library, PackageGraph packageGraph)
1514
: super(element, library, packageGraph);
1615

1716
DartType get aliasedType => element.aliasedType;
@@ -28,7 +27,8 @@ class Typedef extends ModelElement
2827
@override
2928
String get genericParameters => _renderer.renderGenericParameters(this);
3029

31-
List<TypeParameterElement> get genericTypeParameters => element.typeParameters;
30+
List<TypeParameterElement> get genericTypeParameters =>
31+
element.typeParameters;
3232

3333
@override
3434
String get filePath => '${library.dirName}/$fileName';
@@ -61,8 +61,8 @@ class Typedef extends ModelElement
6161

6262
/// A typedef referring to a function type.
6363
class FunctionTypedef extends Typedef {
64-
FunctionTypedef(TypeAliasElement element, Library library,
65-
PackageGraph packageGraph)
64+
FunctionTypedef(
65+
TypeAliasElement element, Library library, PackageGraph packageGraph)
6666
: super(element, library, packageGraph);
6767

6868
@override
@@ -79,4 +79,4 @@ class FunctionTypedef extends Typedef {
7979
}
8080
return super.genericTypeParameters;
8181
}
82-
}
82+
}

‎test/end2end/model_special_cases_test.dart

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ void main() {
7575
}
7676

7777
final _generalizedTypedefsAllowed =
78-
VersionRange(min: Version.parse('2.13.0-0'), includeMin: true);
78+
VersionRange(min: Version.parse('2.13.0-0'), includeMin: true);
7979
// Experimental features not yet enabled by default. Move tests out of this
8080
// block when the feature is enabled by default.
8181
group('Experiments', () {
@@ -85,8 +85,8 @@ void main() {
8585

8686
setUpAll(() async {
8787
generalizedTypedefs = (await _testPackageGraphExperiments)
88-
.libraries
89-
.firstWhere((l) => l.name == 'generalized_typedefs');
88+
.libraries
89+
.firstWhere((l) => l.name == 'generalized_typedefs');
9090
T0 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T0');
9191
T1 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T1');
9292
T2 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T2');
@@ -97,9 +97,11 @@ void main() {
9797
T7 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T7');
9898
});
9999

100-
void expectTypedefs(Typedef t, String modelTypeToString, Iterable<String> genericParameters) {
100+
void expectTypedefs(Typedef t, String modelTypeToString,
101+
Iterable<String> genericParameters) {
101102
expect(t.modelType.toString(), equals(modelTypeToString));
102-
expect(t.genericTypeParameters.map((p) => p.toString()), orderedEquals(genericParameters));
103+
expect(t.genericTypeParameters.map((p) => p.toString()),
104+
orderedEquals(genericParameters));
103105
}
104106

105107
test('basic non-function typedefs work', () {
@@ -110,7 +112,8 @@ void main() {
110112
expectTypedefs(T4, 'void Function()', []);
111113
expectTypedefs(T5, 'X Function(X, {X name})', ['inout X']);
112114
expectTypedefs(T6, 'X Function(Y, [Map<Y, Y>])', ['out X', 'in Y']);
113-
expectTypedefs(T7, 'X Function(Y, [Map<Y, Y>])', ['out X extends String', 'in Y extends List<X>']);
115+
expectTypedefs(T7, 'X Function(Y, [Map<Y, Y>])',
116+
['out X extends String', 'in Y extends List<X>']);
114117
});
115118
}, skip: (!_generalizedTypedefsAllowed.allows(_platformVersion)));
116119
});

‎test/end2end/model_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4139,4 +4139,4 @@ class StringName extends Nameable {
41394139

41404140
@override
41414141
String toString() => name;
4142-
}
4142+
}

‎testing/test_package/lib/completely_empty_lib.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
// @dart=2.9
1+
// @dart=2.9

‎testing/test_package/lib/example.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,8 @@ class Apple {
201201
/**
202202
* fieldWithTypedef docs here
203203
*/
204-
final ParameterizedTypedef<bool> fieldWithTypedef = (bool a, int b) => 'hello, ${a} ${b}';
204+
final ParameterizedTypedef<bool> fieldWithTypedef =
205+
(bool a, int b) => 'hello, ${a} ${b}';
205206
}
206207

207208
/// Extension on Apple

‎testing/test_package/lib/fake.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,12 +1229,11 @@ class _Super5 implements _Super2 {}
12291229

12301230
class Super6 implements _Super5 {}
12311231

1232-
12331232
abstract class IntermediateAbstract extends Object {
12341233
/// This is an override.
12351234
@override
1236-
bool operator==(Object other) {}
1235+
bool operator ==(Object other) {}
12371236
}
12381237

12391238
/// This should inherit [==] from [IntermediateAbstract].
1240-
class IntermediateAbstractSubclass extends IntermediateAbstract {}
1239+
class IntermediateAbstractSubclass extends IntermediateAbstract {}

‎testing/test_package/lib/features/late_final_without_initializer.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ class C {
1717
dField = param * 8.854 * pow(10, -12);
1818
}
1919
}
20-

‎testing/test_package/lib/features/nnbd_class_member_declarations.dart

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@ library nnbd_class_member_declarations;
66

77
/// Test required and covariant parameters
88
abstract class B {
9-
m1(int some, regular, covariant parameters, {
10-
required p1,
11-
int p2 = 3,
12-
required covariant p3,
13-
required covariant int p4,
9+
m1(
10+
int some,
11+
regular,
12+
covariant parameters, {
13+
required p1,
14+
int p2 = 3,
15+
required covariant p3,
16+
required covariant int p4,
1417
});
1518
m2(int sometimes, we, [String have, double optionals]);
1619
}

‎testing/test_package/lib/features/nullable_elements.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ class ComplexNullableMembers<T extends String?> {
3535
void set aComplexSetterOnlyType(List<Map<T?, String?>?> value) => null;
3636

3737
X? aMethod<X extends T?>(X? f) => null;
38-
}
38+
}

‎testing/test_package/lib/implementors.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ abstract class _APrivateThingToImplement implements ImplementBase {}
1515

1616
abstract class ImplementerOfThings implements IntermediateImplementer {}
1717

18-
abstract class ImplementerOfDeclaredPrivateClasses implements _APrivateThingToImplement {}
18+
abstract class ImplementerOfDeclaredPrivateClasses
19+
implements _APrivateThingToImplement {}

‎testing/test_package/lib/src/gadget.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@ class _GadgetBase {
88
int get gadgetGetter => 5;
99
}
1010

11-
12-
class Gadget extends _GadgetBase {}
11+
class Gadget extends _GadgetBase {}

‎testing/test_package/lib/src/intermediate_implements.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ library intermediate_implements;
99

1010
import 'package:test_package/implementors.dart';
1111

12-
abstract class IntermediateImplementer implements ImplementBase {}
12+
abstract class IntermediateImplementer implements ImplementBase {}

‎testing/test_package/lib/src/nodocme.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ library nodocme;
1111
class NodocMeImplementation {}
1212

1313
class MeNeitherEvenWithoutADocComment {}
14-

‎testing/test_package/lib/src/reexport_this.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// @dart=2.9
22

3-
43
library reexport_this;
54

65
/// {@template example:templateMemberTest}
@@ -10,5 +9,4 @@ library reexport_this;
109
///
1110
/// And if I do, a test should fail.
1211
/// {@endtemplate}
13-
class ClassTemplateOneLiner {
14-
}
12+
class ClassTemplateOneLiner {}

‎testing/test_package/lib/src/shadowing_lib.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ class ADuplicateClass {
66
bool get aGetter => true;
77
}
88

9-
class SomeMoreClassDeclaration {}
9+
class SomeMoreClassDeclaration {}

‎testing/test_package/lib/src/somelib.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,16 @@ class BaseReexported {
1414
String action;
1515
}
1616

17-
class ExtendedBaseReexported extends BaseReexported {
18-
}
17+
class ExtendedBaseReexported extends BaseReexported {}
1918

2019
/// A private extension.
2120
extension _Unseen on Object {
22-
void doYouSeeMe() { }
21+
void doYouSeeMe() {}
2322
}
2423

2524
/// An extension without a name
2625
extension on List {
27-
void somethingNew() { }
26+
void somethingNew() {}
2827
}
2928

3029
/// [_Unseen] is not seen, but [DocumentMe] is.

‎testing/test_package/lib/unrelated_factories.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ class AB {
1111
factory AB.fromMap(Map<String, dynamic> map) => AB._AB();
1212

1313
AB._AB();
14-
}
14+
}

‎tool/grind.dart

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,7 @@ void updateThirdParty() async {
222222
void analyze() async {
223223
await SubprocessLauncher('analyze').runStreamed(
224224
sdkBin('dartanalyzer'),
225-
[
226-
'--fatal-infos',
227-
'--options',
228-
'analysis_options_presubmit.yaml',
229-
'.'
230-
],
225+
['--fatal-infos', '--options', 'analysis_options_presubmit.yaml', '.'],
231226
);
232227
}
233228

@@ -249,7 +244,13 @@ void dartfmt() async {
249244
log('Validating dartfmt with version ${Platform.version}');
250245
// TODO(jcollins-g): return to global once dartfmt can handle generic
251246
// type aliases
252-
for (var subDirectory in ['bin', 'lib', 'test', 'tool', path.join('testing/test_package')]) {
247+
for (var subDirectory in [
248+
'bin',
249+
'lib',
250+
'test',
251+
'tool',
252+
path.join('testing/test_package')
253+
]) {
253254
await SubprocessLauncher('dartfmt').runStreamed(
254255
sdkBin('dartfmt'),
255256
[

0 commit comments

Comments
 (0)