Fix for some Quick Fix tests by adding CFE generated error codes.
R=brianwilkerson@google.com
Change-Id: I2b06dc388a00aa0c8e5ab3db045b3fe8ec02ed5e
Reviewed-on: https://dart-review.googlesource.com/69283
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analysis_server/lib/src/services/correction/fix_internal.dart b/pkg/analysis_server/lib/src/services/correction/fix_internal.dart
index f24d409..caeae6f 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix_internal.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix_internal.dart
@@ -400,7 +400,8 @@
if (errorCode == StaticWarningCode.NEW_WITH_UNDEFINED_CONSTRUCTOR) {
await _addFix_createConstructor_named();
}
- if (errorCode ==
+ if (errorCode == StaticWarningCode.CONCRETE_CLASS_WITH_ABSTRACT_MEMBER ||
+ errorCode ==
StaticWarningCode.NON_ABSTRACT_CLASS_INHERITS_ABSTRACT_MEMBER_ONE ||
errorCode ==
StaticWarningCode.NON_ABSTRACT_CLASS_INHERITS_ABSTRACT_MEMBER_TWO ||
@@ -421,6 +422,7 @@
}
if (errorCode == CompileTimeErrorCode.UNDEFINED_CLASS ||
errorCode == StaticWarningCode.CAST_TO_NON_TYPE ||
+ errorCode == StaticWarningCode.NOT_A_TYPE ||
errorCode == StaticWarningCode.TYPE_TEST_WITH_UNDEFINED_NAME ||
errorCode == StaticWarningCode.UNDEFINED_CLASS) {
await _addFix_importLibrary_withType();
@@ -450,7 +452,8 @@
await _addFix_importLibrary_withTopLevelVariable();
await _addFix_createLocalVariable();
}
- if (errorCode == StaticWarningCode.UNDEFINED_NAMED_PARAMETER) {
+ if (errorCode == CompileTimeErrorCode.UNDEFINED_NAMED_PARAMETER ||
+ errorCode == StaticWarningCode.UNDEFINED_NAMED_PARAMETER) {
await _addFix_addMissingNamedArgument();
}
if (errorCode == StaticTypeWarningCode.UNDEFINED_METHOD_WITH_CONSTRUCTOR) {
diff --git a/pkg/analysis_server/test/edit/fixes_test.dart b/pkg/analysis_server/test/edit/fixes_test.dart
index 8548b38..971400e 100644
--- a/pkg/analysis_server/test/edit/fixes_test.dart
+++ b/pkg/analysis_server/test/edit/fixes_test.dart
@@ -175,8 +175,4 @@
class FixesTest_UseCFE extends FixesTest {
@override
bool get useCFE => true;
-
- @failingTest
- @override
- test_fixUndefinedClass() => super.test_fixUndefinedClass();
}
diff --git a/pkg/analysis_server/test/integration/edit/get_fixes_test.dart b/pkg/analysis_server/test/integration/edit/get_fixes_test.dart
index f68d12e..4d916df 100644
--- a/pkg/analysis_server/test/integration/edit/get_fixes_test.dart
+++ b/pkg/analysis_server/test/integration/edit/get_fixes_test.dart
@@ -31,11 +31,20 @@
EditGetFixesResult result =
await sendEditGetFixes(pathname, text.indexOf('Future f'));
- expect(result.fixes, hasLength(1));
+
+ AnalysisErrorFixes fix;
+ if (useCFE) {
+ // TODO(scheglov) We have to filter errors, because two are reported.
+ // https://github.com/dart-lang/sdk/issues/34124
+ fix = result.fixes
+ .singleWhere((fix) => fix.error.code == 'undefined_class');
+ } else {
+ expect(result.fixes, hasLength(1));
+ fix = result.fixes.first;
+ expect(fix.error.code, 'undefined_class');
+ }
// expect a suggestion to add the dart:async import
- AnalysisErrorFixes fix = result.fixes.first;
- expect(fix.error.code, 'undefined_class');
expect(fix.fixes, isNotEmpty);
SourceChange change = fix.fixes.singleWhere(
diff --git a/pkg/analysis_server/test/services/correction/fix_test.dart b/pkg/analysis_server/test/services/correction/fix_test.dart
index 4048ea9..6d4393f 100644
--- a/pkg/analysis_server/test/services/correction/fix_test.dart
+++ b/pkg/analysis_server/test/services/correction/fix_test.dart
@@ -7198,56 +7198,6 @@
@failingTest
@override
- test_addMissingParameterNamed_constructor_hasNamed() =>
- super.test_addMissingParameterNamed_constructor_hasNamed();
-
- @failingTest
- @override
- test_addMissingParameterNamed_constructor_hasRequired() =>
- super.test_addMissingParameterNamed_constructor_hasRequired();
-
- @failingTest
- @override
- test_addMissingParameterNamed_constructor_noParameters() =>
- super.test_addMissingParameterNamed_constructor_noParameters();
-
- @failingTest
- @override
- test_addMissingParameterNamed_constructor_noParameters_named() =>
- super.test_addMissingParameterNamed_constructor_noParameters_named();
-
- @failingTest
- @override
- test_addMissingParameterNamed_function_hasNamed() =>
- super.test_addMissingParameterNamed_function_hasNamed();
-
- @failingTest
- @override
- test_addMissingParameterNamed_function_hasRequired() =>
- super.test_addMissingParameterNamed_function_hasRequired();
-
- @failingTest
- @override
- test_addMissingParameterNamed_function_noParameters() =>
- super.test_addMissingParameterNamed_function_noParameters();
-
- @failingTest
- @override
- test_addMissingParameterNamed_method_hasNamed() =>
- super.test_addMissingParameterNamed_method_hasNamed();
-
- @failingTest
- @override
- test_addMissingParameterNamed_method_hasRequired() =>
- super.test_addMissingParameterNamed_method_hasRequired();
-
- @failingTest
- @override
- test_addMissingParameterNamed_method_noParameters() =>
- super.test_addMissingParameterNamed_method_noParameters();
-
- @failingTest
- @override
test_addMissingRequiredArg_multiple() =>
super.test_addMissingRequiredArg_multiple();
@@ -7334,20 +7284,6 @@
@failingTest
@override
- test_createClass() => super.test_createClass();
-
- @failingTest
- @override
- test_createClass_inLibraryOfPrefix() =>
- super.test_createClass_inLibraryOfPrefix();
-
- @failingTest
- @override
- test_createClass_innerLocalFunction() =>
- super.test_createClass_innerLocalFunction();
-
- @failingTest
- @override
test_createClass_instanceCreation_withoutNew_fromFunction() =>
super.test_createClass_instanceCreation_withoutNew_fromFunction();
@@ -7588,85 +7524,16 @@
@failingTest
@override
- test_createMissingOverrides_field_untyped() =>
- super.test_createMissingOverrides_field_untyped();
-
- @failingTest
- @override
- test_createMissingOverrides_functionTypeAlias() =>
- super.test_createMissingOverrides_functionTypeAlias();
-
- @failingTest
- @override
test_createMissingOverrides_functionTypedParameter() =>
super.test_createMissingOverrides_functionTypedParameter();
@failingTest
@override
- test_createMissingOverrides_generics_typeArguments() =>
- super.test_createMissingOverrides_generics_typeArguments();
-
- @failingTest
- @override
- test_createMissingOverrides_generics_typeParameters() =>
- super.test_createMissingOverrides_generics_typeParameters();
-
- @failingTest
- @override
- test_createMissingOverrides_getter() =>
- super.test_createMissingOverrides_getter();
-
- @failingTest
- @override
- test_createMissingOverrides_importPrefix() =>
- super.test_createMissingOverrides_importPrefix();
-
- @failingTest
- @override
- test_createMissingOverrides_mergeToField_getterSetter() =>
- super.test_createMissingOverrides_mergeToField_getterSetter();
-
- @failingTest
- @override
test_createMissingOverrides_method() =>
super.test_createMissingOverrides_method();
@failingTest
@override
- test_createMissingOverrides_method_emptyClassBody() =>
- super.test_createMissingOverrides_method_emptyClassBody();
-
- @failingTest
- @override
- test_createMissingOverrides_method_generic() =>
- super.test_createMissingOverrides_method_generic();
-
- @failingTest
- @override
- test_createMissingOverrides_method_generic_withBounds() =>
- super.test_createMissingOverrides_method_generic_withBounds();
-
- @failingTest
- @override
- test_createMissingOverrides_method_notEmptyClassBody() =>
- super.test_createMissingOverrides_method_notEmptyClassBody();
-
- @failingTest
- @override
- test_createMissingOverrides_operator() =>
- super.test_createMissingOverrides_operator();
-
- @failingTest
- @override
- test_createMissingOverrides_setter() =>
- super.test_createMissingOverrides_setter();
-
- @failingTest
- @override
- test_createNoSuchMethod_OK() => super.test_createNoSuchMethod_OK();
-
- @failingTest
- @override
test_creationFunction_forFunctionType_cascadeSecond() =>
super.test_creationFunction_forFunctionType_cascadeSecond();
@@ -7732,16 +7599,6 @@
@failingTest
@override
- test_importLibraryPackage_preferDirectOverExport() =>
- super.test_importLibraryPackage_preferDirectOverExport();
-
- @failingTest
- @override
- test_importLibraryPackage_preferDirectOverExport_src() =>
- super.test_importLibraryPackage_preferDirectOverExport_src();
-
- @failingTest
- @override
test_importLibraryProject_BAD_inLibSrc_differentContextRoot() =>
super.test_importLibraryProject_BAD_inLibSrc_differentContextRoot();
@@ -7757,21 +7614,6 @@
@failingTest
@override
- test_importLibraryProject_withClass_inParentFolder() =>
- super.test_importLibraryProject_withClass_inParentFolder();
-
- @failingTest
- @override
- test_importLibraryProject_withClass_inRelativeFolder() =>
- super.test_importLibraryProject_withClass_inRelativeFolder();
-
- @failingTest
- @override
- test_importLibraryProject_withClass_inSameFolder() =>
- super.test_importLibraryProject_withClass_inSameFolder();
-
- @failingTest
- @override
test_importLibraryProject_withClass_instanceCreation_implicit() =>
super.test_importLibraryProject_withClass_instanceCreation_implicit();
@@ -7787,21 +7629,11 @@
@failingTest
@override
- test_importLibraryProject_withFunctionTypeAlias() =>
- super.test_importLibraryProject_withFunctionTypeAlias();
-
- @failingTest
- @override
test_importLibraryProject_withTopLevelVariable() =>
super.test_importLibraryProject_withTopLevelVariable();
@failingTest
@override
- test_importLibrarySdk_withClass_AsExpression() =>
- super.test_importLibrarySdk_withClass_AsExpression();
-
- @failingTest
- @override
test_importLibrarySdk_withClass_instanceCreation_explicitNew() =>
super.test_importLibrarySdk_withClass_instanceCreation_explicitNew();
@@ -7829,11 +7661,6 @@
@failingTest
@override
- test_importLibrarySdk_withClass_IsExpression() =>
- super.test_importLibrarySdk_withClass_IsExpression();
-
- @failingTest
- @override
test_importLibrarySdk_withClass_itemOfList() =>
super.test_importLibrarySdk_withClass_itemOfList();
@@ -7844,21 +7671,11 @@
@failingTest
@override
- test_importLibrarySdk_withClass_typeAnnotation() =>
- super.test_importLibrarySdk_withClass_typeAnnotation();
-
- @failingTest
- @override
test_importLibrarySdk_withClass_typeAnnotation_PrefixedIdentifier() =>
super.test_importLibrarySdk_withClass_typeAnnotation_PrefixedIdentifier();
@failingTest
@override
- test_importLibrarySdk_withClass_typeArgument() =>
- super.test_importLibrarySdk_withClass_typeArgument();
-
- @failingTest
- @override
test_importLibrarySdk_withTopLevelVariable() =>
super.test_importLibrarySdk_withTopLevelVariable();
@@ -7928,11 +7745,6 @@
@failingTest
@override
- test_undefinedClass_useSimilar_fromThisLibrary() =>
- super.test_undefinedClass_useSimilar_fromThisLibrary();
-
- @failingTest
- @override
test_undefinedFunction_create_bottomArgument() =>
super.test_undefinedFunction_create_bottomArgument();
@@ -8103,10 +7915,6 @@
@failingTest
@override
- test_useImportPrefix_withClass() => super.test_useImportPrefix_withClass();
-
- @failingTest
- @override
test_useImportPrefix_withTopLevelVariable() =>
super.test_useImportPrefix_withTopLevelVariable();
}
