Skip to content

Commit 4d85b81

Browse files
jcollins-gjcollins-g
committed
dartfmt
1 parent 5cffc0d commit 4d85b81

File tree

7 files changed

+69
-36
lines changed

7 files changed

+69
-36
lines changed

‎lib/src/line_number_cache.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ SplayTreeMap<int, int> _createLineNumbersMap(String contents) {
2828

2929
do {
3030
result[offset] = lineNumber;
31-
offset = (offset + 1 <= contents.length) ? contents.indexOf(newlineChar, offset + 1) : -1;
31+
offset = (offset + 1 <= contents.length)
32+
? contents.indexOf(newlineChar, offset + 1)
33+
: -1;
3234
lineNumber += 1;
3335
} while (offset != -1);
3436

‎lib/src/model.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4701,9 +4701,10 @@ class PackageGraph {
47014701
Set<ModelElement> precachedElements = new Set();
47024702

47034703
Iterable<Future> precacheOneElement(ModelElement m) sync* {
4704-
for (ModelElement d in m.documentationFrom.where((d) => d.documentationComment != null)) {
4705-
if (needsPrecacheRegExp.hasMatch(d.documentationComment)
4706-
&& !precachedElements.contains(d)) {
4704+
for (ModelElement d
4705+
in m.documentationFrom.where((d) => d.documentationComment != null)) {
4706+
if (needsPrecacheRegExp.hasMatch(d.documentationComment) &&
4707+
!precachedElements.contains(d)) {
47074708
precachedElements.add(d);
47084709
yield d._precacheLocalDocs();
47094710
}

‎test/line_number_cache_test.dart

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,26 @@ void main() {
2424
});
2525

2626
test('validate empty file behavior', () {
27-
File emptyFile = File(pathLib.join(_tempDir.path, 'empty_file'))..writeAsStringSync('');
27+
File emptyFile = File(pathLib.join(_tempDir.path, 'empty_file'))
28+
..writeAsStringSync('');
2829
LineNumberCache cache = LineNumberCache();
2930
expect(cache.lineAndColumn(emptyFile.path, 0), equals(Tuple2(1, 0)));
3031
});
3132

3233
test('single line without newline', () {
33-
File singleLineWithoutNewline = File(pathLib.join(_tempDir.path, 'single_line'))..writeAsStringSync('a single line');
34+
File singleLineWithoutNewline =
35+
File(pathLib.join(_tempDir.path, 'single_line'))
36+
..writeAsStringSync('a single line');
3437
LineNumberCache cache = LineNumberCache();
35-
expect(cache.lineAndColumn(singleLineWithoutNewline.path, 2), equals(Tuple2(1, 2)));
36-
expect(cache.lineAndColumn(singleLineWithoutNewline.path, 0), equals(Tuple2(1, 0)));
38+
expect(cache.lineAndColumn(singleLineWithoutNewline.path, 2),
39+
equals(Tuple2(1, 2)));
40+
expect(cache.lineAndColumn(singleLineWithoutNewline.path, 0),
41+
equals(Tuple2(1, 0)));
3742
});
3843

3944
test('multiple line without trailing newline', () {
40-
File multipleLine = File(pathLib.join(_tempDir.path, 'multiple_line'))..writeAsStringSync('This is the first line\nThis is the second line');
45+
File multipleLine = File(pathLib.join(_tempDir.path, 'multiple_line'))
46+
..writeAsStringSync('This is the first line\nThis is the second line');
4147
LineNumberCache cache = LineNumberCache();
4248
expect(cache.lineAndColumn(multipleLine.path, 60), equals(Tuple2(2, 38)));
4349
expect(cache.lineAndColumn(multipleLine.path, 30), equals(Tuple2(2, 8)));
@@ -46,12 +52,14 @@ void main() {
4652
});
4753

4854
test('multiple lines with trailing newline', () {
49-
File multipleLine = File(pathLib.join(_tempDir.path, 'multiple_line'))..writeAsStringSync('This is the first line\nThis is the second line\n');
55+
File multipleLine = File(pathLib.join(_tempDir.path, 'multiple_line'))
56+
..writeAsStringSync(
57+
'This is the first line\nThis is the second line\n');
5058
LineNumberCache cache = LineNumberCache();
5159
expect(cache.lineAndColumn(multipleLine.path, 60), equals(Tuple2(3, 14)));
5260
expect(cache.lineAndColumn(multipleLine.path, 30), equals(Tuple2(2, 8)));
5361
expect(cache.lineAndColumn(multipleLine.path, 5), equals(Tuple2(1, 5)));
5462
expect(cache.lineAndColumn(multipleLine.path, 0), equals(Tuple2(1, 0)));
5563
});
5664
});
57-
}
65+
}

‎test/model_test.dart

Lines changed: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -88,32 +88,45 @@ void main() {
8888
// when the feature is enabled by default.
8989
group('Experiments', () {
9090
Library main;
91-
TopLevelVariable aComplexSet, inferredTypeSet, specifiedSet, untypedMap, typedSet;
91+
TopLevelVariable aComplexSet,
92+
inferredTypeSet,
93+
specifiedSet,
94+
untypedMap,
95+
typedSet;
9296

9397
setUpAll(() {
94-
main = packageGraphExperiments.libraries.firstWhere((lib) => lib.name == 'main');
98+
main = packageGraphExperiments.libraries
99+
.firstWhere((lib) => lib.name == 'main');
95100
aComplexSet = main.constants.firstWhere((v) => v.name == 'aComplexSet');
96-
inferredTypeSet = main.constants.firstWhere((v) => v.name == 'inferredTypeSet');
101+
inferredTypeSet =
102+
main.constants.firstWhere((v) => v.name == 'inferredTypeSet');
97103
specifiedSet = main.constants.firstWhere((v) => v.name == 'specifiedSet');
98104
untypedMap = main.constants.firstWhere((v) => v.name == 'untypedMap');
99105
typedSet = main.constants.firstWhere((v) => v.name == 'typedSet');
100106
});
101107

102108
test('Set literals test', () {
103109
expect(aComplexSet.modelType.name, equals('Set'));
104-
expect(aComplexSet.modelType.typeArguments.map((a) => a.name).toList(), equals(['AClassContainingLiterals']));
105-
expect(aComplexSet.constantValue, equals('const {const AClassContainingLiterals(3, 5)}'));
110+
expect(aComplexSet.modelType.typeArguments.map((a) => a.name).toList(),
111+
equals(['AClassContainingLiterals']));
112+
expect(aComplexSet.constantValue,
113+
equals('const {const AClassContainingLiterals(3, 5)}'));
106114
expect(inferredTypeSet.modelType.name, equals('Set'));
107-
expect(inferredTypeSet.modelType.typeArguments.map((a) => a.name).toList(), equals(['num']));
115+
expect(
116+
inferredTypeSet.modelType.typeArguments.map((a) => a.name).toList(),
117+
equals(['num']));
108118
expect(inferredTypeSet.constantValue, equals('const {1, 2.5, 3}'));
109119
expect(specifiedSet.modelType.name, equals('Set'));
110-
expect(specifiedSet.modelType.typeArguments.map((a) => a.name).toList(), equals(['int']));
120+
expect(specifiedSet.modelType.typeArguments.map((a) => a.name).toList(),
121+
equals(['int']));
111122
expect(specifiedSet.constantValue, equals('const {}'));
112123
expect(untypedMap.modelType.name, equals('Map'));
113-
expect(untypedMap.modelType.typeArguments.map((a) => a.name).toList(), equals(['dynamic', 'dynamic']));
124+
expect(untypedMap.modelType.typeArguments.map((a) => a.name).toList(),
125+
equals(['dynamic', 'dynamic']));
114126
expect(untypedMap.constantValue, equals('const {}'));
115127
expect(typedSet.modelType.name, equals('Set'));
116-
expect(typedSet.modelType.typeArguments.map((a) => a.name).toList(), equals(['String']));
128+
expect(typedSet.modelType.typeArguments.map((a) => a.name).toList(),
129+
equals(['String']));
117130
expect(typedSet.constantValue, equals('const &lt;String&gt; {}'));
118131
});
119132
});
@@ -128,7 +141,8 @@ void main() {
128141
Method invokeToolNonCanonical, invokeToolNonCanonicalSubclass;
129142
Method invokeToolPrivateLibrary, invokeToolPrivateLibraryOriginal;
130143
Method invokeToolParentDoc, invokeToolParentDocOriginal;
131-
final RegExp packageInvocationIndexRegexp = new RegExp(r'PACKAGE_INVOCATION_INDEX: (\d+)');
144+
final RegExp packageInvocationIndexRegexp =
145+
new RegExp(r'PACKAGE_INVOCATION_INDEX: (\d+)');
132146

133147
setUpAll(() {
134148
_NonCanonicalToolUser = fakeLibrary.allClasses
@@ -165,13 +179,16 @@ void main() {
165179
packageGraph.allLocalModelElements.forEach((m) => m.documentation);
166180
});
167181

168-
test('invokes tool when inherited documentation is the only means for it to be seen', () {
182+
test(
183+
'invokes tool when inherited documentation is the only means for it to be seen',
184+
() {
169185
// Verify setup of the test is correct.
170186
expect(invokeToolParentDoc.isCanonical, isTrue);
171187
expect(invokeToolParentDoc.documentationComment, isNull);
172188
// Error message here might look strange due to toString() on Methods, but if this
173189
// fails that means we don't have the correct invokeToolParentDoc instance.
174-
expect(invokeToolParentDoc.documentationFrom, contains(invokeToolParentDocOriginal));
190+
expect(invokeToolParentDoc.documentationFrom,
191+
contains(invokeToolParentDocOriginal));
175192
// Tool should be substituted out here.
176193
expect(invokeToolParentDoc.documentation, isNot(contains('{@tool')));
177194
});
@@ -187,18 +204,20 @@ void main() {
187204
equals(packageInvocationIndexRegexp
188205
.firstMatch(invokeToolNonCanonicalSubclass.documentation)
189206
.group(1)));
190-
expect(invokeToolPrivateLibrary.documentation, isNot(contains('{@tool')));
207+
expect(
208+
invokeToolPrivateLibrary.documentation, isNot(contains('{@tool')));
191209
expect(
192210
invokeToolPrivateLibraryOriginal.documentation, contains('{@tool'));
193211
});
194212

195213
test('Documentation borrowed from implementer case', () {
196-
expect(packageInvocationIndexRegexp
197-
.firstMatch(invokeToolParentDoc.documentation)
198-
.group(1),
199-
equals(packageInvocationIndexRegexp
200-
.firstMatch(invokeToolParentDocOriginal.documentation)
201-
.group(1)));
214+
expect(
215+
packageInvocationIndexRegexp
216+
.firstMatch(invokeToolParentDoc.documentation)
217+
.group(1),
218+
equals(packageInvocationIndexRegexp
219+
.firstMatch(invokeToolParentDocOriginal.documentation)
220+
.group(1)));
202221
});
203222
});
204223

‎test/src/utils.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ PackageGraph testPackageGraphSdk;
2929

3030
final Directory testPackageBadDir = new Directory('testing/test_package_bad');
3131
final Directory testPackageDir = new Directory('testing/test_package');
32-
final Directory testPackageExperimentsDir = new Directory('testing/test_package_experiments');
32+
final Directory testPackageExperimentsDir =
33+
new Directory('testing/test_package_experiments');
3334
final Directory testPackageMinimumDir =
3435
new Directory('testing/test_package_minimum');
3536
final Directory testPackageWithEmbedderYaml =
@@ -82,8 +83,8 @@ void init({List<String> additionalArguments}) async {
8283

8384
testPackageGraphExperiments = await bootBasicPackage(
8485
'testing/test_package_experiments', [],
85-
additionalArguments: additionalArguments + ['--enable-experiment', 'set-literals']
86-
);
86+
additionalArguments:
87+
additionalArguments + ['--enable-experiment', 'set-literals']);
8788

8889
testPackageGraphSmall = await bootBasicPackage(
8990
'testing/test_package_small', [],

‎testing/test_package/lib/fake.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,8 @@ abstract class ImplementingClassForTool {
10321032
}
10331033

10341034
/// The method [invokeToolParentDoc] gets its documentation from an interface class.
1035-
abstract class CanonicalPrivateInheritedToolUser implements ImplementingClassForTool {
1035+
abstract class CanonicalPrivateInheritedToolUser
1036+
implements ImplementingClassForTool {
10361037
@override
10371038
void invokeToolParentDoc() {
10381039
print('hello, tool world');

‎testing/test_package_experiments/lib/main.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ class AClassContainingLiterals {
1010
const AClassContainingLiterals(this.value1, this.value2);
1111

1212
@override
13-
bool operator==(Object other) => other is AClassContainingLiterals && value1 == other.value1;
13+
bool operator ==(Object other) =>
14+
other is AClassContainingLiterals && value1 == other.value1;
1415
}
1516

16-
const aComplexSet = {AClassContainingLiterals(3, 5)};
17+
const aComplexSet = {AClassContainingLiterals(3, 5)};

0 commit comments

Comments
 (0)