Remove PropertyAccessorFragmentImplImplicitGetter, PropertyAccessorFragmentImplImplicitSetter, and FormalParameterFragmentImplOfImplicitSetter, replace with GetterFragmentImpl, and SetterFragmentImpl.

Change-Id: Iaf8066a5f04635616b18a7c7cfb890f6b2d46df8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/436100
Reviewed-by: Paul Berry <[email protected]>
Commit-Queue: Paul Berry <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: fshcheglov

pkg/analyzer/CHANGELOG.md

@@ -59,6 +59,8 @@
 * Deprecate `InterfaceType.lookUpGetter3`, use `lookUpGetter` instead.
 * Deprecate `InterfaceType.lookUpMethod3`, use `lookUpMethod` instead.
 * Deprecate `InterfaceType.lookUpSetter3`, use `lookUpSetter` instead.
+* Remove `PropertyAccessorFragmentImplImplicitGetter`, `PropertyAccessorFragmentImplImplicitSetter`, 
+  and `FormalParameterFragmentImplOfImplicitSetter`, replace with `GetterFragmentImpl`, and `SetterFragmentImpl`.
 
 ## 7.4.1
 * Restore `InstanceElement.augmented` getter.

pkg/analyzer/lib/src/dart/element/element.dart

@@ -3618,71 +3618,6 @@ class FormalParameterFragmentImpl extends VariableFragmentImpl
   ) => FormalParameterElementImpl(firstFragment as FormalParameterFragmentImpl);
 }
 
-/// The parameter of an implicit setter.
-class FormalParameterFragmentImplOfImplicitSetter
-    extends FormalParameterFragmentImpl {
-  final PropertyAccessorFragmentImplImplicitSetter setter;
-
-  FormalParameterFragmentImplOfImplicitSetter(this.setter)
-    : super(
-        nameOffset: -1,
-        name2:
-            setter.variable2.name2 == null
-                ? null
-                : considerCanonicalizeString('_${setter.variable2.name2!}'),
-        nameOffset2: null,
-        parameterKind: ParameterKind.REQUIRED,
-      ) {
-    enclosingElement3 = setter;
-    isSynthetic = true;
-  }
-
-  @override
-  bool get inheritsCovariant {
-    var variable = setter.variable2;
-    if (variable is FieldFragmentImpl) {
-      return variable.inheritsCovariant;
-    }
-    return false;
-  }
-
-  @override
-  set inheritsCovariant(bool value) {
-    var variable = setter.variable2;
-    if (variable is FieldFragmentImpl) {
-      variable.inheritsCovariant = value;
-    }
-  }
-
-  @override
-  bool get isCovariant {
-    if (isExplicitlyCovariant || inheritsCovariant) {
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  bool get isExplicitlyCovariant {
-    var variable = setter.variable2;
-    if (variable is FieldFragmentImpl) {
-      return variable.isCovariant;
-    }
-    return false;
-  }
-
-  @override
-  int get offset => setter.offset;
-
-  @override
-  TypeImpl get type => setter.variable2.type;
-
-  @override
-  set type(DartType type) {
-    assert(false); // Should never be called.
-  }
-}
-
 mixin FragmentedAnnotatableElementMixin<E extends Fragment>
     implements FragmentedElementMixin<E> {
   String? get documentationComment {
@@ -9027,122 +8962,6 @@ sealed class PropertyAccessorFragmentImpl extends ExecutableFragmentImpl
   }
 }
 
-/// Implicit getter for a [PropertyInducingFragmentImpl].
-class PropertyAccessorFragmentImplImplicitGetter extends GetterFragmentImpl {
-  /// Create the implicit getter and bind it to the [property].
-  PropertyAccessorFragmentImplImplicitGetter(super.property)
-    : super.forVariable();
-
-  @override
-  FragmentImpl get enclosingElement3 {
-    return variable2.enclosingElement3;
-  }
-
-  @override
-  bool get hasImplicitReturnType => variable2.hasImplicitType;
-
-  @override
-  bool get isGetter => true;
-
-  @override
-  String? get name2 => variable2.name2;
-
-  @override
-  int get offset => variable2.offset;
-
-  @override
-  TypeImpl get returnType => variable2.type;
-
-  @override
-  set returnType(DartType returnType) {
-    assert(false); // Should never be called.
-  }
-
-  @override
-  Version? get sinceSdkVersion => variable2.sinceSdkVersion;
-
-  @override
-  FunctionTypeImpl get type {
-    return _type ??= FunctionTypeImpl(
-      typeFormals: const <TypeParameterFragmentImpl>[],
-      parameters: const <FormalParameterElementImpl>[],
-      returnType: returnType,
-      nullabilitySuffix: NullabilitySuffix.none,
-    );
-  }
-
-  @override
-  set type(FunctionType type) {
-    assert(false); // Should never be called.
-  }
-
-  @override
-  PropertyInducingFragmentImpl get variable2 => super.variable2!;
-}
-
-/// Implicit setter for a [PropertyInducingFragmentImpl].
-class PropertyAccessorFragmentImplImplicitSetter extends SetterFragmentImpl {
-  /// Create the implicit setter and bind it to the [property].
-  PropertyAccessorFragmentImplImplicitSetter(super.property)
-    : super.forVariable();
-
-  @override
-  FragmentImpl get enclosingElement3 {
-    return variable2.enclosingElement3;
-  }
-
-  @override
-  bool get isSetter => true;
-
-  @override
-  String? get name2 => variable2.name2;
-
-  @override
-  int get offset => variable2.offset;
-
-  @override
-  List<FormalParameterFragmentImpl> get parameters {
-    if (_parameters.isNotEmpty) {
-      return _parameters;
-    }
-
-    return _parameters = List.generate(
-      1,
-      (_) => FormalParameterFragmentImplOfImplicitSetter(this),
-      growable: false,
-    );
-  }
-
-  @override
-  TypeImpl get returnType => VoidTypeImpl.instance;
-
-  @override
-  set returnType(DartType returnType) {
-    assert(false); // Should never be called.
-  }
-
-  @override
-  Version? get sinceSdkVersion => variable2.sinceSdkVersion;
-
-  @override
-  FunctionTypeImpl get type {
-    return _type ??= FunctionTypeImpl(
-      typeFormals: const <TypeParameterFragmentImpl>[],
-      parameters: parameters.map((f) => f.asElement2).toList(),
-      returnType: returnType,
-      nullabilitySuffix: NullabilitySuffix.none,
-    );
-  }
-
-  @override
-  set type(FunctionType type) {
-    assert(false); // Should never be called.
-  }
-
-  @override
-  PropertyInducingFragmentImpl get variable2 => super.variable2!;
-}
-
 /// Common base class for all analyzer-internal classes that implement
 /// [PropertyInducingElement].
 abstract class PropertyInducingElement2OrMember
@@ -9370,23 +9189,6 @@ abstract class PropertyInducingFragmentImpl
     shouldUseTypeForInitializerInference = false;
     return _type!;
   }
-
-  @override
-  set type(TypeImpl type) {
-    super.type = type;
-    // Reset cached types of synthetic getters and setters.
-    // TODO(scheglov): Consider not caching these types.
-    if (!isSynthetic) {
-      var getter = this.getter;
-      if (getter is PropertyAccessorFragmentImplImplicitGetter) {
-        getter._type = null;
-      }
-      var setter = this.setter;
-      if (setter is PropertyAccessorFragmentImplImplicitSetter) {
-        setter._type = null;
-      }
-    }
-  }
 }
 
 /// Common base class for all analyzer-internal classes that implement

pkg/analyzer/lib/src/test_utilities/mock_sdk_elements.dart

@@ -1025,15 +1025,26 @@ class _MockSdkElementsBuilder {
     fragment.isFinal = isFinal;
     fragment.isStatic = isStatic;
 
-    var getterFragment = PropertyAccessorFragmentImplImplicitGetter(fragment);
+    var getterFragment = GetterFragmentImpl(name2: name, nameOffset: -1)
+      ..isSynthetic = true;
     var getterElement = GetterElementImpl(Reference.root(), getterFragment);
     element.getter2 = getterElement;
 
     if (!isConst && !isFinal) {
-      var setterFragment = PropertyAccessorFragmentImplImplicitSetter(fragment);
+      var valueFragment = FormalParameterFragmentImpl(
+        nameOffset: -1,
+        name2: null,
+        nameOffset2: null,
+        parameterKind: ParameterKind.REQUIRED,
+      );
+      var setterFragment =
+          SetterFragmentImpl(name2: name, nameOffset: -1)
+            ..isSynthetic = true
+            ..parameters = [valueFragment];
       var setterElement = SetterElementImpl(Reference.root(), setterFragment);
       element.setter2 = setterElement;
     }
+
     fragment.type = type;
     return fragment;
   }
@@ -1260,7 +1271,8 @@ class _MockSdkElementsBuilder {
     var fragment = TopLevelVariableFragmentImpl(name2: name, nameOffset: -1)
       ..isConst = true;
     var element = TopLevelVariableElementImpl(Reference.root(), fragment);
-    var getterFragment = PropertyAccessorFragmentImplImplicitGetter(fragment);
+    var getterFragment = GetterFragmentImpl(name2: name, nameOffset: -1)
+      ..isSynthetic = true;
     var getterElement = GetterElementImpl(Reference.root(), getterFragment);
     element.getter2 = getterElement;
     fragment.type = type;