Skip to content

Commit 8de8a1c

Browse files
scheglovscheglov
committed
Move codes from StaticTypeWarningCode into CompileTimeErrorCode.
They are all errors now. Change-Id: If48d38e38e845fd5b5a950dd5514bf1cbbce03d8 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/155880 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
1 parent 2044eae commit 8de8a1c

File tree

377 files changed

+3036
-3079
lines changed

Some content is hidden

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

377 files changed

+3036
-3079
lines changed

‎pkg/analysis_server/lib/src/edit/fix/fix_error_task.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class FixErrorTask {
6565
static void fixNamedConstructorTypeArgs(DartFixRegistrar registrar,
6666
DartFixListener listener, EditDartfixParams params) {
6767
registrar.registerErrorTask(
68-
StaticTypeWarningCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS_CONSTRUCTOR,
68+
CompileTimeErrorCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS_CONSTRUCTOR,
6969
FixErrorTask(listener));
7070
}
7171
}

‎pkg/analysis_server/lib/src/services/correction/fix.dart‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@ import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
1414

1515
/// Return true if this [errorCode] is likely to have a fix associated with it.
1616
bool hasFix(ErrorCode errorCode) =>
17-
errorCode == CompileTimeErrorCode.UNDEFINED_CLASS_BOOLEAN ||
17+
errorCode == CompileTimeErrorCode.CAST_TO_NON_TYPE ||
1818
errorCode == CompileTimeErrorCode.CONCRETE_CLASS_WITH_ABSTRACT_MEMBER ||
19+
errorCode == CompileTimeErrorCode.ILLEGAL_ASYNC_RETURN_TYPE ||
20+
errorCode == CompileTimeErrorCode.INSTANCE_ACCESS_TO_STATIC_MEMBER ||
21+
errorCode == CompileTimeErrorCode.INVOCATION_OF_NON_FUNCTION ||
1922
errorCode == CompileTimeErrorCode.NEW_WITH_UNDEFINED_CONSTRUCTOR ||
2023
errorCode ==
2124
CompileTimeErrorCode.NON_ABSTRACT_CLASS_INHERITS_ABSTRACT_MEMBER_ONE ||
@@ -29,7 +32,7 @@ bool hasFix(ErrorCode errorCode) =>
2932
errorCode ==
3033
CompileTimeErrorCode
3134
.NON_ABSTRACT_CLASS_INHERITS_ABSTRACT_MEMBER_FIVE_PLUS ||
32-
errorCode == CompileTimeErrorCode.CAST_TO_NON_TYPE ||
35+
errorCode == CompileTimeErrorCode.NON_TYPE_AS_TYPE_ARGUMENT ||
3336
errorCode == CompileTimeErrorCode.TYPE_TEST_WITH_UNDEFINED_NAME ||
3437
errorCode == CompileTimeErrorCode.FINAL_NOT_INITIALIZED ||
3538
errorCode == CompileTimeErrorCode.FINAL_NOT_INITIALIZED_CONSTRUCTOR_1 ||
@@ -44,8 +47,13 @@ bool hasFix(ErrorCode errorCode) =>
4447
errorCode == CompileTimeErrorCode.NO_DEFAULT_SUPER_CONSTRUCTOR_EXPLICIT ||
4548
errorCode == CompileTimeErrorCode.PART_OF_NON_PART ||
4649
errorCode == CompileTimeErrorCode.UNDEFINED_ANNOTATION ||
50+
errorCode == CompileTimeErrorCode.UNDEFINED_CLASS_BOOLEAN ||
4751
errorCode ==
4852
CompileTimeErrorCode.UNDEFINED_CONSTRUCTOR_IN_INITIALIZER_DEFAULT ||
53+
errorCode == CompileTimeErrorCode.UNDEFINED_FUNCTION ||
54+
errorCode == CompileTimeErrorCode.UNDEFINED_GETTER ||
55+
errorCode == CompileTimeErrorCode.UNDEFINED_METHOD ||
56+
errorCode == CompileTimeErrorCode.UNDEFINED_SETTER ||
4957
errorCode == CompileTimeErrorCode.URI_DOES_NOT_EXIST ||
5058
errorCode == CompileTimeErrorCode.URI_HAS_NOT_BEEN_GENERATED ||
5159
errorCode == HintCode.CAN_BE_NULL_AFTER_NULL_AWARE ||
@@ -60,14 +68,6 @@ bool hasFix(ErrorCode errorCode) =>
6068
errorCode == ParserErrorCode.EXPECTED_TOKEN ||
6169
errorCode == ParserErrorCode.GETTER_WITH_PARAMETERS ||
6270
errorCode == ParserErrorCode.VAR_AS_TYPE_NAME ||
63-
errorCode == StaticTypeWarningCode.ILLEGAL_ASYNC_RETURN_TYPE ||
64-
errorCode == StaticTypeWarningCode.INSTANCE_ACCESS_TO_STATIC_MEMBER ||
65-
errorCode == StaticTypeWarningCode.INVOCATION_OF_NON_FUNCTION ||
66-
errorCode == StaticTypeWarningCode.NON_TYPE_AS_TYPE_ARGUMENT ||
67-
errorCode == StaticTypeWarningCode.UNDEFINED_FUNCTION ||
68-
errorCode == StaticTypeWarningCode.UNDEFINED_GETTER ||
69-
errorCode == StaticTypeWarningCode.UNDEFINED_METHOD ||
70-
errorCode == StaticTypeWarningCode.UNDEFINED_SETTER ||
7171
errorCode == CompileTimeErrorCode.UNDEFINED_NAMED_PARAMETER ||
7272
(errorCode is LintCode &&
7373
(errorCode.name == LintNames.always_require_non_null_named_parameters ||

‎pkg/analysis_server/lib/src/services/correction/fix_internal.dart‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,9 @@ class FixProcessor extends BaseProcessor {
528528
CompileTimeErrorCode.NON_TYPE_IN_CATCH_CLAUSE: [
529529
ImportLibrary.forType,
530530
],
531+
CompileTimeErrorCode.NON_TYPE_AS_TYPE_ARGUMENT: [
532+
ImportLibrary.forType,
533+
],
531534
CompileTimeErrorCode.NOT_A_TYPE: [
532535
ImportLibrary.forType,
533536
],
@@ -544,12 +547,25 @@ class FixProcessor extends BaseProcessor {
544547
CompileTimeErrorCode.UNDEFINED_CONSTRUCTOR_IN_INITIALIZER_DEFAULT: [
545548
AddSuperConstructorInvocation.newInstance,
546549
],
550+
CompileTimeErrorCode.UNDEFINED_FUNCTION: [
551+
ImportLibrary.forExtension,
552+
ImportLibrary.forFunction,
553+
ImportLibrary.forType,
554+
],
555+
CompileTimeErrorCode.UNDEFINED_GETTER: [
556+
ImportLibrary.forTopLevelVariable,
557+
ImportLibrary.forType,
558+
],
547559
CompileTimeErrorCode.UNDEFINED_IDENTIFIER: [
548560
ImportLibrary.forExtension,
549561
ImportLibrary.forFunction,
550562
ImportLibrary.forTopLevelVariable,
551563
ImportLibrary.forType,
552564
],
565+
CompileTimeErrorCode.UNDEFINED_METHOD: [
566+
ImportLibrary.forFunction,
567+
ImportLibrary.forType,
568+
],
553569
CompileTimeErrorCode.UNDEFINED_NAMED_PARAMETER: [
554570
ChangeArgumentName.newInstance,
555571
],
@@ -562,22 +578,6 @@ class FixProcessor extends BaseProcessor {
562578
HintCode.SDK_VERSION_ASYNC_EXPORTED_FROM_CORE: [
563579
ImportLibrary.dartAsync,
564580
],
565-
StaticTypeWarningCode.NON_TYPE_AS_TYPE_ARGUMENT: [
566-
ImportLibrary.forType,
567-
],
568-
StaticTypeWarningCode.UNDEFINED_FUNCTION: [
569-
ImportLibrary.forExtension,
570-
ImportLibrary.forFunction,
571-
ImportLibrary.forType,
572-
],
573-
StaticTypeWarningCode.UNDEFINED_GETTER: [
574-
ImportLibrary.forTopLevelVariable,
575-
ImportLibrary.forType,
576-
],
577-
StaticTypeWarningCode.UNDEFINED_METHOD: [
578-
ImportLibrary.forFunction,
579-
ImportLibrary.forType,
580-
],
581581
};
582582

583583
/// A map from error codes to a list of generators used to create the
@@ -651,20 +651,33 @@ class FixProcessor extends BaseProcessor {
651651
CompileTimeErrorCode.FINAL_NOT_INITIALIZED_CONSTRUCTOR_3_PLUS: [
652652
AddFieldFormalParameters.newInstance,
653653
],
654+
CompileTimeErrorCode.ILLEGAL_ASYNC_RETURN_TYPE: [
655+
ReplaceReturnTypeFuture.newInstance,
656+
],
654657
CompileTimeErrorCode.IMPLEMENTS_NON_CLASS: [
655658
ChangeTo.classOrMixin,
656659
CreateClass.newInstance,
657660
],
658661
CompileTimeErrorCode.INITIALIZING_FORMAL_FOR_NON_EXISTENT_FIELD: [
659662
CreateField.newInstance,
660663
],
664+
CompileTimeErrorCode.INSTANCE_ACCESS_TO_STATIC_MEMBER: [
665+
ChangeToStaticAccess.newInstance,
666+
],
661667
CompileTimeErrorCode.INTEGER_LITERAL_IMPRECISE_AS_DOUBLE: [
662668
ChangeToNearestPreciseValue.newInstance,
663669
],
664670
CompileTimeErrorCode.INVALID_ANNOTATION: [
665671
ChangeTo.annotation,
666672
CreateClass.newInstance,
667673
],
674+
CompileTimeErrorCode.INVALID_ASSIGNMENT: [
675+
AddExplicitCast.newInstance,
676+
ChangeTypeAnnotation.newInstance,
677+
],
678+
CompileTimeErrorCode.INVOCATION_OF_NON_FUNCTION_EXPRESSION: [
679+
RemoveParenthesesInGetterInvocation.newInstance,
680+
],
668681
CompileTimeErrorCode.MISSING_DEFAULT_VALUE_FOR_PARAMETER: [
669682
AddRequiredKeyword.newInstance,
670683
],
@@ -707,6 +720,13 @@ class FixProcessor extends BaseProcessor {
707720
CreateNoSuchMethod.newInstance,
708721
MakeClassAbstract.newInstance,
709722
],
723+
CompileTimeErrorCode.NON_BOOL_CONDITION: [
724+
AddNeNull.newInstance,
725+
],
726+
CompileTimeErrorCode.NON_TYPE_AS_TYPE_ARGUMENT: [
727+
CreateClass.newInstance,
728+
CreateMixin.newInstance,
729+
],
710730
CompileTimeErrorCode.NOT_A_TYPE: [
711731
ChangeTo.classOrMixin,
712732
CreateClass.newInstance,
@@ -756,6 +776,20 @@ class FixProcessor extends BaseProcessor {
756776
ChangeTo.getterOrSetter,
757777
CreateSetter.newInstance,
758778
],
779+
CompileTimeErrorCode.UNDEFINED_FUNCTION: [
780+
ChangeTo.function,
781+
CreateClass.newInstance,
782+
CreateFunction.newInstance,
783+
],
784+
CompileTimeErrorCode.UNDEFINED_GETTER: [
785+
ChangeTo.getterOrSetter,
786+
CreateClass.newInstance,
787+
CreateField.newInstance,
788+
CreateGetter.newInstance,
789+
CreateLocalVariable.newInstance,
790+
CreateMethodOrFunction.newInstance,
791+
CreateMixin.newInstance,
792+
],
759793
CompileTimeErrorCode.UNDEFINED_IDENTIFIER: [
760794
ChangeTo.getterOrSetter,
761795
CreateClass.newInstance,
@@ -769,11 +803,28 @@ class FixProcessor extends BaseProcessor {
769803
CompileTimeErrorCode.UNDEFINED_IDENTIFIER_AWAIT: [
770804
AddAsync.newInstance,
771805
],
806+
CompileTimeErrorCode.UNDEFINED_METHOD: [
807+
ChangeTo.method,
808+
CreateClass.newInstance,
809+
CreateFunction.newInstance,
810+
CreateMethod.method,
811+
],
772812
CompileTimeErrorCode.UNDEFINED_NAMED_PARAMETER: [
773813
AddMissingParameterNamed.newInstance,
774814
ConvertFlutterChild.newInstance,
775815
ConvertFlutterChildren.newInstance,
776816
],
817+
CompileTimeErrorCode.UNDEFINED_SETTER: [
818+
ChangeTo.getterOrSetter,
819+
CreateField.newInstance,
820+
CreateSetter.newInstance,
821+
],
822+
CompileTimeErrorCode.UNQUALIFIED_REFERENCE_TO_NON_LOCAL_STATIC_MEMBER: [
823+
// TODO(brianwilkerson) Consider adding fixes to create a field, getter,
824+
// method or setter. The existing _addFix methods would need to be
825+
// updated so that only the appropriate subset is generated.
826+
QualifyReference.newInstance,
827+
],
777828
CompileTimeErrorCode
778829
.UNQUALIFIED_REFERENCE_TO_STATIC_MEMBER_OF_EXTENDED_TYPE: [
779830
// TODO(brianwilkerson) Consider adding fixes to create a field, getter,
@@ -784,6 +835,10 @@ class FixProcessor extends BaseProcessor {
784835
CompileTimeErrorCode.URI_DOES_NOT_EXIST: [
785836
CreateFile.newInstance,
786837
],
838+
CompileTimeErrorCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS_CONSTRUCTOR: [
839+
MoveTypeArgumentsToClass.newInstance,
840+
RemoveTypeArguments.newInstance,
841+
],
787842

788843
HintCode.CAN_BE_NULL_AFTER_NULL_AWARE: [
789844
ReplaceWithNullAware.newInstance,
@@ -943,61 +998,6 @@ class FixProcessor extends BaseProcessor {
943998
ParserErrorCode.VAR_AS_TYPE_NAME: [
944999
ReplaceVarWithDynamic.newInstance,
9451000
],
946-
StaticTypeWarningCode.ILLEGAL_ASYNC_RETURN_TYPE: [
947-
ReplaceReturnTypeFuture.newInstance,
948-
],
949-
StaticTypeWarningCode.INSTANCE_ACCESS_TO_STATIC_MEMBER: [
950-
ChangeToStaticAccess.newInstance,
951-
],
952-
StaticTypeWarningCode.INVALID_ASSIGNMENT: [
953-
AddExplicitCast.newInstance,
954-
ChangeTypeAnnotation.newInstance,
955-
],
956-
StaticTypeWarningCode.INVOCATION_OF_NON_FUNCTION_EXPRESSION: [
957-
RemoveParenthesesInGetterInvocation.newInstance,
958-
],
959-
StaticTypeWarningCode.NON_BOOL_CONDITION: [
960-
AddNeNull.newInstance,
961-
],
962-
StaticTypeWarningCode.NON_TYPE_AS_TYPE_ARGUMENT: [
963-
CreateClass.newInstance,
964-
CreateMixin.newInstance,
965-
],
966-
StaticTypeWarningCode.UNDEFINED_FUNCTION: [
967-
ChangeTo.function,
968-
CreateClass.newInstance,
969-
CreateFunction.newInstance,
970-
],
971-
StaticTypeWarningCode.UNDEFINED_GETTER: [
972-
ChangeTo.getterOrSetter,
973-
CreateClass.newInstance,
974-
CreateField.newInstance,
975-
CreateGetter.newInstance,
976-
CreateLocalVariable.newInstance,
977-
CreateMethodOrFunction.newInstance,
978-
CreateMixin.newInstance,
979-
],
980-
StaticTypeWarningCode.UNDEFINED_METHOD: [
981-
ChangeTo.method,
982-
CreateClass.newInstance,
983-
CreateFunction.newInstance,
984-
CreateMethod.method,
985-
],
986-
StaticTypeWarningCode.UNDEFINED_SETTER: [
987-
ChangeTo.getterOrSetter,
988-
CreateField.newInstance,
989-
CreateSetter.newInstance,
990-
],
991-
StaticTypeWarningCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS_CONSTRUCTOR: [
992-
MoveTypeArgumentsToClass.newInstance,
993-
RemoveTypeArguments.newInstance,
994-
],
995-
StaticTypeWarningCode.UNQUALIFIED_REFERENCE_TO_NON_LOCAL_STATIC_MEMBER: [
996-
// TODO(brianwilkerson) Consider adding fixes to create a field, getter,
997-
// method or setter. The existing _addFix methods would need to be
998-
// updated so that only the appropriate subset is generated.
999-
QualifyReference.newInstance,
1000-
],
10011001
StaticWarningCode.DEAD_NULL_AWARE_EXPRESSION: [
10021002
RemoveDeadIfNull.newInstance,
10031003
],

‎pkg/analysis_server/test/context_manager_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1544,7 +1544,7 @@ abstract class ContextManagerTest with ResourceProviderMixin {
15441544
]);
15451545

15461546
AnalysisError invalid_assignment_error =
1547-
AnalysisError(null, 0, 1, StaticTypeWarningCode.INVALID_ASSIGNMENT, [
1547+
AnalysisError(null, 0, 1, CompileTimeErrorCode.INVALID_ASSIGNMENT, [
15481548
['x'],
15491549
['y']
15501550
]);

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ f(A a) {
6464
class A {}
6565
class B {}
6666
''');
67-
await assertHasFixAllFix(StaticTypeWarningCode.INVALID_ASSIGNMENT, '''
67+
await assertHasFixAllFix(CompileTimeErrorCode.INVALID_ASSIGNMENT, '''
6868
f(A a) {
6969
B b, b2;
7070
b = a as B;
@@ -106,7 +106,7 @@ f(List<A> a) {
106106
class A {}
107107
class B {}
108108
''');
109-
await assertHasFixAllFix(StaticTypeWarningCode.INVALID_ASSIGNMENT, '''
109+
await assertHasFixAllFix(CompileTimeErrorCode.INVALID_ASSIGNMENT, '''
110110
f(List<A> a) {
111111
List<B> b, b2;
112112
b = a.where((e) => e is B).cast<B>().toList();
@@ -148,7 +148,7 @@ f(Map<A, B> a) {
148148
class A {}
149149
class B {}
150150
''');
151-
await assertHasFixAllFix(StaticTypeWarningCode.INVALID_ASSIGNMENT, '''
151+
await assertHasFixAllFix(CompileTimeErrorCode.INVALID_ASSIGNMENT, '''
152152
f(Map<A, B> a) {
153153
Map<B, A> b, b2;
154154
b = a.cast<B, A>();
@@ -196,7 +196,7 @@ class A {
196196
}
197197
class B {}
198198
''');
199-
await assertHasFixAllFix(StaticTypeWarningCode.INVALID_ASSIGNMENT, '''
199+
await assertHasFixAllFix(CompileTimeErrorCode.INVALID_ASSIGNMENT, '''
200200
f(A a) {
201201
B b, b2;
202202
b = (a..m()) as B;
@@ -240,7 +240,7 @@ f(Set<A> a) {
240240
class A {}
241241
class B {}
242242
''');
243-
await assertHasFixAllFix(StaticTypeWarningCode.INVALID_ASSIGNMENT, '''
243+
await assertHasFixAllFix(CompileTimeErrorCode.INVALID_ASSIGNMENT, '''
244244
f(Set<A> a) {
245245
Set<B> b, b2;
246246
b = a.cast<B>();
@@ -291,7 +291,7 @@ f(A a) {
291291
class A {}
292292
class B {}
293293
''');
294-
await assertHasFixAllFix(StaticTypeWarningCode.INVALID_ASSIGNMENT, '''
294+
await assertHasFixAllFix(CompileTimeErrorCode.INVALID_ASSIGNMENT, '''
295295
f(A a) {
296296
B b = a as B;
297297
B b2 = a as B;
@@ -329,7 +329,7 @@ f(List<A> a) {
329329
class A {}
330330
class B {}
331331
''');
332-
await assertHasFixAllFix(StaticTypeWarningCode.INVALID_ASSIGNMENT, '''
332+
await assertHasFixAllFix(CompileTimeErrorCode.INVALID_ASSIGNMENT, '''
333333
f(List<A> a) {
334334
List<B> b = a.where((e) => e is B).cast<B>().toList();
335335
List<B> b2 = a.where((e) => e is B).cast<B>().toList();
@@ -367,7 +367,7 @@ f(Map<A, B> a) {
367367
class A {}
368368
class B {}
369369
''');
370-
await assertHasFixAllFix(StaticTypeWarningCode.INVALID_ASSIGNMENT, '''
370+
await assertHasFixAllFix(CompileTimeErrorCode.INVALID_ASSIGNMENT, '''
371371
f(Map<A, B> a) {
372372
Map<B, A> b = a.cast<B, A>();
373373
Map<B, A> b2 = a.cast<B, A>();
@@ -411,7 +411,7 @@ class A {
411411
}
412412
class B {}
413413
''');
414-
await assertHasFixAllFix(StaticTypeWarningCode.INVALID_ASSIGNMENT, '''
414+
await assertHasFixAllFix(CompileTimeErrorCode.INVALID_ASSIGNMENT, '''
415415
f(A a) {
416416
B b = (a..m()) as B;
417417
B b2 = (a..m()) as B;
@@ -451,7 +451,7 @@ f(Set<A> a) {
451451
class A {}
452452
class B {}
453453
''');
454-
await assertHasFixAllFix(StaticTypeWarningCode.INVALID_ASSIGNMENT, '''
454+
await assertHasFixAllFix(CompileTimeErrorCode.INVALID_ASSIGNMENT, '''
455455
f(Set<A> a) {
456456
Set<B> b = a.cast<B>();
457457
Set<B> b2 = a.cast<B>();
@@ -469,7 +469,7 @@ void foo(int a) {
469469
''');
470470
await assertNoFix(
471471
errorFilter: (e) {
472-
return e.errorCode == StaticTypeWarningCode.INVALID_ASSIGNMENT;
472+
return e.errorCode == CompileTimeErrorCode.INVALID_ASSIGNMENT;
473473
},
474474
);
475475
}

0 commit comments

Comments
 (0)