Issue 58580. Support for getter_setter_error feature.

Bug: #58580
Change-Id: I1926ffb0157ef1b5c294487b183f93cbcb0ea177
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/422180
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Paul Berry <[email protected]>

Author: scheglov

pkg/analyzer/api.txt

@@ -100,6 +100,7 @@ package:analyzer/dart/analysis/features.dart:
     enhanced_parts (static getter: ExperimentalFeature)
     extension_methods (static getter: ExperimentalFeature)
     generic_metadata (static getter: ExperimentalFeature)
+    getter_setter_error (static getter: ExperimentalFeature)
     inference_update_1 (static getter: ExperimentalFeature)
     inference_update_2 (static getter: ExperimentalFeature)
     inference_update_3 (static getter: ExperimentalFeature)

pkg/analyzer/lib/dart/analysis/features.dart

@@ -46,6 +46,9 @@ abstract class Feature {
   /// Feature information for generic metadata.
   static final generic_metadata = ExperimentalFeatures.generic_metadata;
 
+  /// Feature information for getter-setter-error.
+  static final getter_setter_error = ExperimentalFeatures.getter_setter_error;
+
   /// Feature information for inference using bounds.
   static final inference_using_bounds =
       ExperimentalFeatures.inference_using_bounds;

pkg/analyzer/lib/src/error/getter_setter_types_verifier.dart

@@ -2,6 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/src/dart/element/element.dart';
@@ -14,28 +15,45 @@ import 'package:analyzer/src/error/codes.dart';
 /// of the corresponding setter. Where "match" means "subtype" in non-nullable,
 /// and "assignable" in legacy.
 class GetterSetterTypesVerifier {
+  final LibraryElementImpl library;
   final TypeSystemImpl _typeSystem;
   final ErrorReporter _errorReporter;
 
   GetterSetterTypesVerifier({
-    required TypeSystemImpl typeSystem,
+    required this.library,
     required ErrorReporter errorReporter,
-  })  : _typeSystem = typeSystem,
+  })  : _typeSystem = library.typeSystem,
         _errorReporter = errorReporter;
 
+  bool get _skipGetterSetterTypesCheck {
+    return library.featureSet.isEnabled(Feature.getter_setter_error);
+  }
+
   void checkExtension(ExtensionElementImpl2 element) {
+    if (_skipGetterSetterTypesCheck) {
+      return;
+    }
+
     for (var getter in element.getters2) {
       _checkLocalGetter(getter);
     }
   }
 
   void checkExtensionType(
       ExtensionTypeElementImpl2 element, Interface interface) {
+    if (_skipGetterSetterTypesCheck) {
+      return;
+    }
+
     checkInterface(element, interface);
     checkStaticGetters(element.getters2);
   }
 
   void checkInterface(InterfaceElementImpl2 element, Interface interface) {
+    if (_skipGetterSetterTypesCheck) {
+      return;
+    }
+
     var libraryUri = element.library2.uri;
 
     var interfaceMap = interface.map2;
@@ -88,6 +106,10 @@ class GetterSetterTypesVerifier {
   }
 
   void checkStaticGetters(List<GetterElement2OrMember> getters) {
+    if (_skipGetterSetterTypesCheck) {
+      return;
+    }
+
     for (var getter in getters) {
       if (getter.isStatic) {
         _checkLocalGetter(getter);

pkg/analyzer/lib/src/error/inheritance_override.dart

@@ -282,7 +282,7 @@ class _ClassVerifier {
     _checkIllegalEnumValuesInheritance();
 
     GetterSetterTypesVerifier(
-      typeSystem: typeSystem,
+      library: library,
       errorReporter: reporter,
     ).checkInterface(element, interface);
 

pkg/analyzer/lib/src/generated/error_verifier.dart

@@ -484,7 +484,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
       _checkForMixinClassErrorCodes(node, members, superclass, withClause);
 
       GetterSetterTypesVerifier(
-        typeSystem: typeSystem,
+        library: _currentLibrary,
         errorReporter: errorReporter,
       ).checkStaticGetters(augmented.getters2);
 
@@ -541,7 +541,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     _checkForIllegalLanguageOverride(node);
 
     GetterSetterTypesVerifier(
-      typeSystem: typeSystem,
+      library: _currentLibrary,
       errorReporter: errorReporter,
     ).checkStaticGetters(fragment.element.getters);
 
@@ -665,7 +665,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
       _checkForEnumInstantiatedToBoundsIsNotWellBounded(node, declaredFragment);
 
       GetterSetterTypesVerifier(
-        typeSystem: typeSystem,
+        library: _currentLibrary,
         errorReporter: errorReporter,
       ).checkStaticGetters(declaredElement.getters2);
 
@@ -709,7 +709,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     _checkForFinalNotInitializedInClass(declaredFragment, node.members);
 
     GetterSetterTypesVerifier(
-      typeSystem: typeSystem,
+      library: _currentLibrary,
       errorReporter: errorReporter,
     ).checkExtension(declaredElement);
 
@@ -763,7 +763,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
 
       var interface = _inheritanceManager.getInterface(firstFragment);
       GetterSetterTypesVerifier(
-        typeSystem: typeSystem,
+        library: _currentLibrary,
         errorReporter: errorReporter,
       ).checkExtensionType(declaredElement, interface);
 

pkg/analyzer/test/generated/non_error_resolver_test.dart

@@ -738,17 +738,6 @@ set x(_) {}
 ''');
   }
 
-  test_conflictingStaticGetterAndInstanceSetter_thisClass() async {
-    await assertErrorsInCode(r'''
-class A {
-  static get x => 0;
-  static set x(int p) {}
-}
-''', [
-      error(CompileTimeErrorCode.GETTER_NOT_SUBTYPE_SETTER_TYPES, 23, 1),
-    ]);
-  }
-
   test_const_constructor_with_named_generic_parameter() async {
     await assertNoErrorsInCode('''
 class C<T> {