Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 22b9847

Browse files
Dmitry Stefantsovcommit-bot@chromium.org
Dmitry Stefantsov
authored and
commit-bot@chromium.org
committed
[analyzer][cfe] Don't crash on converting errors with Severity.context
Change-Id: I70760dc2c1bc2f6a0b4bbec6887ebfac0b1f3172 Reviewed-on: https://dart-review.googlesource.com/63400 Commit-Queue: Dmitry Stefantsov <dmitryas@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
1 parent 4fd0404 commit 22b9847

File tree

4 files changed

+5
-191
lines changed

4 files changed

+5
-191
lines changed

‎pkg/analyzer/lib/src/fasta/error_converter.dart‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,11 @@ class FastaErrorReporter {
657657
errorCode,
658658
message.message,
659659
message.tip));
660-
} else {
660+
} else if (message.severity != Severity.context) {
661+
// Messages with [Severity.context] are supposed to give extra information
662+
// to messages of other kinds, and it should be possible to ignore them
663+
// without affecting the discoverability of compile-time errors. See also
664+
// https://github.com/dart-lang/sdk/issues/33730.
661665
throw new StateError('Unable to convert (${message.code}, $errorCodeStr, '
662666
'@${message.span.start.offset}, $message)');
663667
}

‎pkg/analyzer/test/generated/compile_time_error_code_kernel_test.dart‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -275,13 +275,6 @@ class CompileTimeErrorCodeTest_Kernel extends CompileTimeErrorCodeTest_Driver {
275275
await super.test_constConstructorWithNonFinalField_super();
276276
}
277277

278-
@override
279-
@failingTest
280-
test_constConstructorWithNonFinalField_this() async {
281-
// Expected 1 errors of type CompileTimeErrorCode.CONST_CONSTRUCTOR_WITH_NON_FINAL_FIELD, found 0
282-
await super.test_constConstructorWithNonFinalField_this();
283-
}
284-
285278
@override
286279
@failingTest
287280
test_constEval_newInstance_constConstructor() async {
@@ -683,69 +676,13 @@ class CompileTimeErrorCodeTest_Kernel extends CompileTimeErrorCodeTest_Driver {
683676
return super.test_duplicateDefinition_inPart();
684677
}
685678

686-
@override
687-
@failingTest
688-
test_duplicateDefinition_locals_inCase() async {
689-
// Bad state: No type information for a at 58
690-
await super.test_duplicateDefinition_locals_inCase();
691-
}
692-
693-
@override
694-
@failingTest
695-
test_duplicateDefinition_locals_inFunctionBlock() async {
696-
// Bad state: No declaration information for m(a) {} at 24
697-
await super.test_duplicateDefinition_locals_inFunctionBlock();
698-
}
699-
700-
@override
701-
@failingTest
702-
test_duplicateDefinition_locals_inIf() async {
703-
// Bad state: No type information for a at 49
704-
await super.test_duplicateDefinition_locals_inIf();
705-
}
706-
707-
@override
708-
@failingTest
709-
test_duplicateDefinition_locals_inMethodBlock() async {
710-
// Bad state: No type information for a at 37
711-
await super.test_duplicateDefinition_locals_inMethodBlock();
712-
}
713-
714-
@override
715-
@failingTest
716-
test_duplicateDefinition_parameters_inConstructor() async {
717-
// Expected 1 errors of type CompileTimeErrorCode.DUPLICATE_DEFINITION, found 0
718-
await super.test_duplicateDefinition_parameters_inConstructor();
719-
}
720-
721-
@override
722-
@failingTest
723-
test_duplicateDefinition_parameters_inFunctionTypeAlias() async {
724-
// Expected 1 errors of type CompileTimeErrorCode.DUPLICATE_DEFINITION, found 0
725-
await super.test_duplicateDefinition_parameters_inFunctionTypeAlias();
726-
}
727-
728679
@override
729680
@failingTest
730681
test_duplicateDefinition_parameters_inLocalFunction() async {
731682
// Expected 1 errors of type CompileTimeErrorCode.DUPLICATE_DEFINITION, found 0
732683
await super.test_duplicateDefinition_parameters_inLocalFunction();
733684
}
734685

735-
@override
736-
@failingTest
737-
test_duplicateDefinition_parameters_inMethod() async {
738-
// Expected 1 errors of type CompileTimeErrorCode.DUPLICATE_DEFINITION, found 0
739-
await super.test_duplicateDefinition_parameters_inMethod();
740-
}
741-
742-
@override
743-
@failingTest
744-
test_duplicateDefinition_parameters_inTopLevelFunction() async {
745-
// Expected 1 errors of type CompileTimeErrorCode.DUPLICATE_DEFINITION, found 0
746-
await super.test_duplicateDefinition_parameters_inTopLevelFunction();
747-
}
748-
749686
@override
750687
@failingTest
751688
test_duplicateDefinition_typeParameters() async {
@@ -2757,13 +2694,6 @@ class CompileTimeErrorCodeTest_Kernel extends CompileTimeErrorCodeTest_Driver {
27572694
await super.test_returnInGenerator_syncStar();
27582695
}
27592696

2760-
@override
2761-
@failingTest
2762-
test_sharedDeferredPrefix() async {
2763-
// Bad state: Expected element reference for analyzer offset 86; got one for kernel offset 90
2764-
await super.test_sharedDeferredPrefix();
2765-
}
2766-
27672697
@override
27682698
@failingTest
27692699
test_superInInvalidContext_binaryExpression() async {

‎pkg/analyzer/test/generated/static_warning_code_kernel_test.dart‎

Lines changed: 0 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -945,13 +945,6 @@ class StaticWarningCodeTest_Kernel extends StaticWarningCodeTest_Driver {
945945
return super.test_inconsistentMethodInheritanceGetterAndMethod();
946946
}
947947

948-
@override
949-
@failingTest
950-
@potentialAnalyzerProblem
951-
test_invalidGetterOverrideReturnType() async {
952-
return super.test_invalidGetterOverrideReturnType();
953-
}
954-
955948
@override
956949
@failingTest
957950
@potentialAnalyzerProblem
@@ -974,42 +967,6 @@ class StaticWarningCodeTest_Kernel extends StaticWarningCodeTest_Driver {
974967
.test_invalidGetterOverrideReturnType_twoInterfaces_conflicting();
975968
}
976969

977-
@override
978-
@failingTest
979-
@potentialAnalyzerProblem
980-
test_invalidMethodOverrideNamedParamType() async {
981-
return super.test_invalidMethodOverrideNamedParamType();
982-
}
983-
984-
@override
985-
@failingTest
986-
@potentialAnalyzerProblem
987-
test_invalidMethodOverrideNormalParamType_interface() async {
988-
return super.test_invalidMethodOverrideNormalParamType_interface();
989-
}
990-
991-
@override
992-
@failingTest
993-
@potentialAnalyzerProblem
994-
test_invalidMethodOverrideNormalParamType_superclass() async {
995-
return super.test_invalidMethodOverrideNormalParamType_superclass();
996-
}
997-
998-
@override
999-
@failingTest
1000-
@potentialAnalyzerProblem
1001-
test_invalidMethodOverrideNormalParamType_superclass_interface() async {
1002-
return super
1003-
.test_invalidMethodOverrideNormalParamType_superclass_interface();
1004-
}
1005-
1006-
@override
1007-
@failingTest
1008-
@potentialAnalyzerProblem
1009-
test_invalidMethodOverrideNormalParamType_twoInterfaces() async {
1010-
return super.test_invalidMethodOverrideNormalParamType_twoInterfaces();
1011-
}
1012-
1013970
@override
1014971
@failingTest
1015972
@potentialAnalyzerProblem
@@ -1018,69 +975,13 @@ class StaticWarningCodeTest_Kernel extends StaticWarningCodeTest_Driver {
1018975
.test_invalidMethodOverrideNormalParamType_twoInterfaces_conflicting();
1019976
}
1020977

1021-
@override
1022-
@failingTest
1023-
@potentialAnalyzerProblem
1024-
test_invalidMethodOverrideOptionalParamType() async {
1025-
return super.test_invalidMethodOverrideOptionalParamType();
1026-
}
1027-
1028-
@override
1029-
@failingTest
1030-
@potentialAnalyzerProblem
1031-
test_invalidMethodOverrideOptionalParamType_twoInterfaces() async {
1032-
return super.test_invalidMethodOverrideOptionalParamType_twoInterfaces();
1033-
}
1034-
1035-
@override
1036-
@failingTest
1037-
@potentialAnalyzerProblem
1038-
test_invalidMethodOverrideReturnType_interface() async {
1039-
return super.test_invalidMethodOverrideReturnType_interface();
1040-
}
1041-
1042-
@override
1043-
@failingTest
1044-
@potentialAnalyzerProblem
1045-
test_invalidMethodOverrideReturnType_interface_grandparent() async {
1046-
return super.test_invalidMethodOverrideReturnType_interface_grandparent();
1047-
}
1048-
1049-
@override
1050-
@failingTest
1051-
@potentialAnalyzerProblem
1052-
test_invalidMethodOverrideReturnType_mixin() async {
1053-
return super.test_invalidMethodOverrideReturnType_mixin();
1054-
}
1055-
1056-
@override
1057-
@failingTest
1058-
@potentialAnalyzerProblem
1059-
test_invalidMethodOverrideReturnType_superclass() async {
1060-
return super.test_invalidMethodOverrideReturnType_superclass();
1061-
}
1062-
1063-
@override
1064-
@failingTest
1065-
@potentialAnalyzerProblem
1066-
test_invalidMethodOverrideReturnType_superclass_grandparent() async {
1067-
return super.test_invalidMethodOverrideReturnType_superclass_grandparent();
1068-
}
1069-
1070978
@override
1071979
@failingTest
1072980
@potentialAnalyzerProblem
1073981
test_invalidMethodOverrideReturnType_twoInterfaces() async {
1074982
return super.test_invalidMethodOverrideReturnType_twoInterfaces();
1075983
}
1076984

1077-
@override
1078-
@failingTest
1079-
@potentialAnalyzerProblem
1080-
test_invalidMethodOverrideReturnType_void() async {
1081-
return super.test_invalidMethodOverrideReturnType_void();
1082-
}
1083-
1084985
@override
1085986
@failingTest
1086987
@potentialAnalyzerProblem
@@ -1123,13 +1024,6 @@ class StaticWarningCodeTest_Kernel extends StaticWarningCodeTest_Driver {
11231024
return super.test_invalidOverrideRequired();
11241025
}
11251026

1126-
@override
1127-
@failingTest
1128-
@potentialAnalyzerProblem
1129-
test_invalidSetterOverrideNormalParamType() async {
1130-
return super.test_invalidSetterOverrideNormalParamType();
1131-
}
1132-
11331027
@override
11341028
@failingTest
11351029
@potentialAnalyzerProblem
@@ -1138,13 +1032,6 @@ class StaticWarningCodeTest_Kernel extends StaticWarningCodeTest_Driver {
11381032
.test_invalidSetterOverrideNormalParamType_superclass_interface();
11391033
}
11401034

1141-
@override
1142-
@failingTest
1143-
@potentialAnalyzerProblem
1144-
test_invalidSetterOverrideNormalParamType_twoInterfaces() async {
1145-
return super.test_invalidSetterOverrideNormalParamType_twoInterfaces();
1146-
}
1147-
11481035
@override
11491036
@failingTest
11501037
@potentialAnalyzerProblem

‎pkg/analyzer/test/generated/strong_mode_kernel_test.dart‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -396,13 +396,6 @@ class StrongModeStaticTypeAnalyzer2Test_Kernel
396396
.test_genericMethod_override_invalidContravariantTypeParamBounds();
397397
}
398398

399-
@override
400-
@failingTest
401-
test_genericMethod_override_invalidReturnType() async {
402-
// Expected 1 errors of type StrongModeCode.STRONG_MODE_INVALID_METHOD_OVERRIDE, found 0
403-
await super.test_genericMethod_override_invalidReturnType();
404-
}
405-
406399
@override
407400
@failingTest
408401
test_genericMethod_override_invalidTypeParamCount() async {

0 commit comments

Comments
 (0)