Remove an unnecessary error code

bwilkerson · commit-bot@chromium.org · commit 1dbcf2445a36 · 2019-08-10T14:04:05.000Z
Change-Id: Idb57f172535cd1233c0ffa4b4ac254c990ba75e3 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112606 Reviewed-by: Konstantin Shcheglov <scheglov@google.com> Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analyzer/lib/error/error.dart b/pkg/analyzer/lib/error/error.dart
@@ -65,7 +65,6 @@ const List<ErrorCode> errorCodeValues = const [
   CheckedModeCompileTimeErrorCode.VARIABLE_TYPE_MISMATCH,
   CompileTimeErrorCode.ABSTRACT_SUPER_MEMBER_REFERENCE,
   CompileTimeErrorCode.ACCESS_PRIVATE_ENUM_FIELD,
-  CompileTimeErrorCode.ACCESS_STATIC_EXTENSION_MEMBER,
   CompileTimeErrorCode.AMBIGUOUS_EXPORT,
   CompileTimeErrorCode.AMBIGUOUS_EXTENSION_METHOD_ACCESS,
   CompileTimeErrorCode.AMBIGUOUS_SET_OR_MAP_LITERAL_BOTH,
diff --git a/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart
@@ -363,9 +363,9 @@ class MethodInvocationResolver {
     if (member.isStatic) {
       _setDynamicResolution(node);
       _resolver.errorReporter.reportErrorForNode(
-        CompileTimeErrorCode.ACCESS_STATIC_EXTENSION_MEMBER,
-        nameNode,
-      );
+          StaticTypeWarningCode.INSTANCE_ACCESS_TO_STATIC_MEMBER,
+          nameNode,
+          [name, member.kind.displayName, member.enclosingElement.name]);
       return result;
     }
 
diff --git a/pkg/analyzer/lib/src/error/codes.dart b/pkg/analyzer/lib/src/error/codes.dart
@@ -125,15 +125,6 @@ class CompileTimeErrorCode extends ErrorCode {
           "The private fields of an enum can't be accessed, even within the "
               "same library.");
 
-  /**
-   * No parameters.
-   */
-  //todo (pq): refactor to reuse StaticTypeWarningCode.INSTANCE_ACCESS_TO_STATIC_MEMBER.
-  static const CompileTimeErrorCode ACCESS_STATIC_EXTENSION_MEMBER =
-      const CompileTimeErrorCode('ACCESS_STATIC_EXTENSION_MEMBER',
-          "Static extension members can't be accessed.",
-          correction: "Try removing the static member access.");
-
   /**
    * 14.2 Exports: It is a compile-time error if a name <i>N</i> is re-exported
    * by a library <i>L</i> and <i>N</i> is introduced into the export namespace
diff --git a/pkg/analyzer/test/src/diagnostics/instance_access_to_static_member_test.dart b/pkg/analyzer/test/src/diagnostics/instance_access_to_static_member_test.dart
@@ -11,19 +11,25 @@ import '../dart/resolution/driver_resolution.dart';
 
 main() {
   defineReflectiveSuite(() {
-    defineReflectiveTests(AccessStaticExtensionMemberTest);
+    defineReflectiveTests(InstanceAccessToStaticMemberTest);
+    defineReflectiveTests(InstanceAccessToStaticMemberWithExtensionMethodsTest);
   });
 }
 
 @reflectiveTest
-class AccessStaticExtensionMemberTest extends DriverResolutionTest {
+class InstanceAccessToStaticMemberTest extends DriverResolutionTest {}
+
+@reflectiveTest
+class InstanceAccessToStaticMemberWithExtensionMethodsTest
+    extends InstanceAccessToStaticMemberTest {
   @override
   AnalysisOptionsImpl get analysisOptions => AnalysisOptionsImpl()
     ..contextFeatures = new FeatureSet.forTesting(
         sdkVersion: '2.3.0', additionalFeatures: [Feature.extension_methods]);
 
   @failingTest
   test_getter() async {
+    // No error generated
     await assertErrorsInCode('''
 class C {}
 
@@ -35,7 +41,7 @@ f(C c) {
   c.a;
 }
 ''', [
-      error(CompileTimeErrorCode.ACCESS_STATIC_EXTENSION_MEMBER, 72, 1),
+      error(StaticTypeWarningCode.INSTANCE_ACCESS_TO_STATIC_MEMBER, 72, 1),
     ]);
   }
 
@@ -51,24 +57,25 @@ f(C c) {
   c.a();
 }
 ''', [
-      error(CompileTimeErrorCode.ACCESS_STATIC_EXTENSION_MEMBER, 68, 1),
+      error(StaticTypeWarningCode.INSTANCE_ACCESS_TO_STATIC_MEMBER, 68, 1),
     ]);
   }
 
   @failingTest
   test_setter() async {
+    // No error generated
     await assertErrorsInCode('''
 class C {}
 
 extension E on C {
-  static set a(v) {}}
+  static set a(v) {}
 }
 
 f(C c) {
   c.a = 2;
 }
 ''', [
-      error(CompileTimeErrorCode.ACCESS_STATIC_EXTENSION_MEMBER, 69, 1),
+      error(StaticTypeWarningCode.INSTANCE_ACCESS_TO_STATIC_MEMBER, 69, 1),
     ]);
   }
 }
diff --git a/pkg/analyzer/test/src/diagnostics/test_all.dart b/pkg/analyzer/test/src/diagnostics/test_all.dart
@@ -4,8 +4,6 @@
 
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
-import 'access_static_extension_member_test.dart'
-    as access_static_extension_member;
 import 'ambiguous_export_test.dart' as ambiguous_export;
 import 'ambiguous_extension_method_access_test.dart'
     as ambiguous_extension_method_access;
@@ -98,6 +96,8 @@ import 'import_deferred_library_with_load_function_test.dart'
 import 'import_duplicated_library_named_test.dart'
     as import_duplicated_library_named;
 import 'import_of_non_library_test.dart' as import_of_non_library;
+import 'instance_access_to_static_member_test.dart'
+    as instance_access_to_static_member;
 import 'invalid_assignment_test.dart' as invalid_assignment;
 import 'invalid_cast_new_expr_test.dart' as invalid_cast_new_expr;
 import 'invalid_extension_argument_count_test.dart'
@@ -290,7 +290,6 @@ import 'wrong_type_parameter_variance_in_superinterface_test.dart'
 
 main() {
   defineReflectiveSuite(() {
-    access_static_extension_member.main();
     ambiguous_export.main();
     ambiguous_extension_method_access.main();
     ambiguous_import.main();
@@ -354,6 +353,7 @@ main() {
     import_deferred_library_with_load_function.main();
     import_duplicated_library_named.main();
     import_of_non_library.main();
+    instance_access_to_static_member.main();
     invalid_assignment.main();
     invalid_cast_new_expr.main();
     invalid_extension_argument_count.main();
