Skip to content

Commit f3db401

Browse files
FMorschelCommit Queue
FMorschel
authored and
Commit Queue
committed
[CQ] Renames diagnostic filter typedef and uses for clarity and consistency
Change-Id: I61298eae14b3b850c192dd3d969d5337aa1addb1 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/457782 Reviewed-by: Brian Wilkerson <[email protected]> Auto-Submit: Felipe Morschel <[email protected]> Reviewed-by: Samuel Rawlins <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]>
1 parent 6f6f221 commit f3db401

File tree

63 files changed

+323
-348
lines changed

Some content is hidden

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

63 files changed

+323
-348
lines changed

‎pkg/analysis_server/test/src/services/correction/fix/add_async_test.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Future<int> f() async {
7070
return 1;
7171
}
7272
''',
73-
errorFilter: (error) {
73+
filter: (error) {
7474
return error.diagnosticCode ==
7575
CompileTimeErrorCode.undefinedIdentifierAwait;
7676
},
@@ -89,7 +89,7 @@ void takeFutureCallback(Future callback()) {}
8989
9090
void doStuff() => takeFutureCallback(() async => await 1);
9191
''',
92-
errorFilter: (error) {
92+
filter: (error) {
9393
return error.diagnosticCode ==
9494
CompileTimeErrorCode.undefinedIdentifierAwait;
9595
},
@@ -466,7 +466,7 @@ Future<int> f() async {
466466
return 42;
467467
}
468468
''',
469-
errorFilter: (error) {
469+
filter: (error) {
470470
return error.diagnosticCode == CompileTimeErrorCode.awaitInWrongContext;
471471
},
472472
);

‎pkg/analysis_server/test/src/services/correction/fix/add_await_test.dart‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,17 +154,13 @@ void f() async {
154154
doSomething()
155155
}
156156
''');
157-
await assertHasFix(
158-
'''
157+
await assertHasFix('''
159158
Future doSomething() => Future.value('');
160159
161160
void f() async {
162161
await doSomething()
163162
}
164-
''',
165-
errorFilter: (error) =>
166-
error.diagnosticCode != ParserErrorCode.expectedToken,
167-
);
163+
''', filter: (error) => error.diagnosticCode != ParserErrorCode.expectedToken);
168164
}
169165

170166
Future<void> test_nonBoolCondition_futureBool() async {
@@ -325,7 +321,7 @@ Future<void> baz() async {
325321
variable = await bar();
326322
}
327323
''',
328-
errorFilter: (error) =>
324+
filter: (error) =>
329325
error.diagnosticCode == CompileTimeErrorCode.invalidAssignment,
330326
);
331327
}
@@ -339,7 +335,7 @@ void baz() {
339335
}
340336
''');
341337
await assertNoFix(
342-
errorFilter: (error) =>
338+
filter: (error) =>
343339
error.diagnosticCode == CompileTimeErrorCode.invalidAssignment,
344340
);
345341
}
@@ -360,7 +356,7 @@ Future<void> baz() async {
360356
String variable = await bar();
361357
}
362358
''',
363-
errorFilter: (error) =>
359+
filter: (error) =>
364360
error.diagnosticCode == CompileTimeErrorCode.invalidAssignment,
365361
);
366362
}

‎pkg/analysis_server/test/src/services/correction/fix/add_diagnostic_property_reference_test.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ class C extends Widget with Diagnosticable {
658658
}
659659
}
660660
''',
661-
errorFilter: (error) =>
661+
filter: (error) =>
662662
error.diagnosticCode != CompileTimeErrorCode.undefinedClass,
663663
);
664664
}
@@ -692,7 +692,7 @@ class C extends Widget with Diagnosticable {
692692
}
693693
}
694694
''',
695-
errorFilter: (error) =>
695+
filter: (error) =>
696696
error.diagnosticCode != CompileTimeErrorCode.undefinedClass,
697697
);
698698
}

‎pkg/analysis_server/test/src/services/correction/fix/add_enum_constant_test.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ void f() {
299299
E.ONE;
300300
}
301301
''',
302-
errorFilter: (e) {
302+
filter: (e) {
303303
return e.diagnosticCode == CompileTimeErrorCode.undefinedEnumConstant;
304304
},
305305
);
@@ -321,7 +321,7 @@ E e() {
321321
return .ONE;
322322
}
323323
''',
324-
errorFilter: (e) {
324+
filter: (e) {
325325
return e.diagnosticCode ==
326326
CompileTimeErrorCode.dotShorthandUndefinedGetter;
327327
},

‎pkg/analysis_server/test/src/services/correction/fix/add_explicit_cast_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ void foo(int a) {
644644
}
645645
''');
646646
await assertNoFix(
647-
errorFilter: (e) {
647+
filter: (e) {
648648
return e.diagnosticCode == CompileTimeErrorCode.invalidAssignment;
649649
},
650650
);

‎pkg/analysis_server/test/src/services/correction/fix/add_extension_override_test.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void f(String str) {
4949
}
5050
''',
5151
matchFixMessage: "Add an extension override for 'StringExt1'",
52-
errorFilter: (error) =>
52+
filter: (error) =>
5353
error.diagnosticCode ==
5454
CompileTimeErrorCode.ambiguousExtensionMemberAccessTwo,
5555
);
@@ -60,7 +60,7 @@ void f(String str) {
6060
"Add an extension override for 'StringExt1'",
6161
"Add an extension override for 'StringExt2'",
6262
],
63-
errorFilter: (error) =>
63+
filter: (error) =>
6464
error.diagnosticCode ==
6565
CompileTimeErrorCode.ambiguousExtensionMemberAccessTwo,
6666
);
@@ -124,7 +124,7 @@ f() {
124124
}
125125
''',
126126
expectedNumberOfFixesForKind: 1,
127-
errorFilter: (error) {
127+
filter: (error) {
128128
return error.diagnosticCode ==
129129
CompileTimeErrorCode.ambiguousExtensionMemberAccessTwo;
130130
},
@@ -201,7 +201,7 @@ extension E2 on A {
201201
}
202202
''',
203203
matchFixMessage: "Add an extension override for 'E2'",
204-
errorFilter: (error) =>
204+
filter: (error) =>
205205
error.diagnosticCode ==
206206
CompileTimeErrorCode.ambiguousExtensionMemberAccessTwo,
207207
);
@@ -236,7 +236,7 @@ extension E2 on A {
236236
}
237237
''',
238238
matchFixMessage: "Add an extension override for 'E2'",
239-
errorFilter: (error) =>
239+
filter: (error) =>
240240
error.diagnosticCode ==
241241
CompileTimeErrorCode.ambiguousExtensionMemberAccessTwo,
242242
);
@@ -275,7 +275,7 @@ extension E2 on A {
275275
}
276276
''',
277277
matchFixMessage: "Add an extension override for 'E2'",
278-
errorFilter: (error) =>
278+
filter: (error) =>
279279
error.diagnosticCode ==
280280
CompileTimeErrorCode.ambiguousExtensionMemberAccessTwo,
281281
);
@@ -383,7 +383,7 @@ void f(String str) {
383383
}
384384
''',
385385
matchFixMessage: "Add an extension override for 'StringExt1'",
386-
errorFilter: (error) =>
386+
filter: (error) =>
387387
error.diagnosticCode ==
388388
CompileTimeErrorCode.ambiguousExtensionMemberAccessTwo,
389389
);
@@ -394,7 +394,7 @@ void f(String str) {
394394
"Add an extension override for 'StringExt1'",
395395
"Add an extension override for 'StringExt2'",
396396
],
397-
errorFilter: (error) =>
397+
filter: (error) =>
398398
error.diagnosticCode ==
399399
CompileTimeErrorCode.ambiguousExtensionMemberAccessTwo,
400400
);

‎pkg/analysis_server/test/src/services/correction/fix/add_key_to_constructors_test.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class MyWidget extends StatelessWidget {
151151
final int field;
152152
MyWidget({super.key}) : field = 0;
153153
}
154-
''', errorFilter: lintNameFilter(LintNames.use_key_in_widget_constructors));
154+
''', filter: lintNameFilter(LintNames.use_key_in_widget_constructors));
155155
}
156156

157157
Future<void> test_class_withSuper_middle() async {
@@ -172,7 +172,7 @@ class MyWidget extends StatelessWidget {
172172
final int field2;
173173
MyWidget({super.key}) : field1 = 1, field2 = 2;
174174
}
175-
''', errorFilter: lintNameFilter(LintNames.use_key_in_widget_constructors));
175+
''', filter: lintNameFilter(LintNames.use_key_in_widget_constructors));
176176
}
177177

178178
Future<void> test_constructor_namedParameters_withoutSuper() async {

‎pkg/analysis_server/test/src/services/correction/fix/add_late_test.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ class C {
136136
}
137137
}
138138
''',
139-
errorFilter: (error) =>
139+
filter: (error) =>
140140
error.diagnosticCode == CompileTimeErrorCode.assignmentToFinal,
141141
);
142142
}
@@ -174,7 +174,7 @@ void f(C c) {
174174
c.s = '';
175175
}
176176
''',
177-
errorFilter: (error) =>
177+
filter: (error) =>
178178
error.diagnosticCode == CompileTimeErrorCode.assignmentToFinal,
179179
);
180180
}
@@ -197,7 +197,7 @@ class C {
197197
}
198198
}
199199
''',
200-
errorFilter: (error) =>
200+
filter: (error) =>
201201
error.diagnosticCode == CompileTimeErrorCode.assignmentToFinal,
202202
);
203203
}

‎pkg/analysis_server/test/src/services/correction/fix/add_missing_enum_case_clauses_test.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class AddMissingEnumCaseClausesTest extends FixProcessorTest {
4141
}
4242

4343
Future<void> assertHasFixWithFilter(String expected) async {
44-
await assertHasFix(expected, errorFilter: _filter);
44+
await assertHasFix(expected, filter: _filter);
4545
}
4646

4747
Future<void> test_empty_language219() async {
@@ -274,7 +274,7 @@ void f(E e) {
274274
switch(e
275275
}
276276
''');
277-
await assertNoFix(errorFilter: _filter);
277+
await assertNoFix(filter: _filter);
278278
}
279279

280280
Future<void> test_notBrackets_language219() async {

‎pkg/analysis_server/test/src/services/correction/fix/add_missing_enum_like_case_clauses_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class AddMissingEnumLikeCaseClausesTest extends FixProcessorLintTest {
4040
}
4141

4242
Future<void> assertHasFixWithFilter(String expected) async {
43-
await assertHasFix(expected, errorFilter: _filter);
43+
await assertHasFix(expected, filter: _filter);
4444
}
4545

4646
Future<void> test_empty() async {

0 commit comments

Comments
 (0)