Elements. Remove V1 ExtensionElement, ExtensionTypeElement.

Change-Id: I079d3cca39c89864aba56af63e2f19f9eeebac38
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/423164
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analyzer/api.txt

@@ -2958,15 +2958,6 @@ package:analyzer/dart/constant/value.dart:
     toSymbolValue (method: String? Function())
     toTypeValue (method: DartType? Function())
 package:analyzer/dart/element/element.dart:
-  AugmentedExtensionElement (class extends Object implements AugmentedInstanceElement, deprecated):
-    new (constructor: AugmentedExtensionElement Function())
-    extendedType (getter: DartType)
-  AugmentedExtensionTypeElement (class extends Object implements AugmentedInterfaceElement, deprecated):
-    new (constructor: AugmentedExtensionTypeElement Function())
-    firstFragment (getter: ExtensionTypeElement)
-    primaryConstructor (getter: ConstructorElement)
-    representation (getter: FieldElement)
-    typeErasure (getter: DartType)
   AugmentedInstanceElement (class extends Object, deprecated):
     new (constructor: AugmentedInstanceElement Function())
     accessors (getter: List<PropertyAccessorElement>)
@@ -3002,11 +2993,8 @@ package:analyzer/dart/element/element.dart:
     isStatic (getter: bool)
   CompilationUnitElement (class extends Object implements UriReferencedElement, deprecated):
     new (constructor: CompilationUnitElement Function())
-    accessibleExtensions (getter: List<ExtensionElement>)
     accessors (getter: List<PropertyAccessorElement>)
     enclosingElement3 (getter: CompilationUnitElement?)
-    extensionTypes (getter: List<ExtensionTypeElement>, experimental)
-    extensions (getter: List<ExtensionElement>)
     functions (getter: List<FunctionElement>)
     libraryExports (getter: List<LibraryExportElement>)
     libraryImportPrefixes (getter: List<PrefixElement>)
@@ -3209,20 +3197,6 @@ package:analyzer/dart/element/element.dart:
     isStatic (getter: bool)
     isSynchronous (getter: bool)
     name (getter: String)
-  ExtensionElement (class extends Object implements InstanceElement, deprecated):
-    new (constructor: ExtensionElement Function())
-    augmented (getter: AugmentedExtensionElement, deprecated)
-    extendedType (getter: DartType)
-    getField (method: FieldElement? Function(String))
-    getGetter (method: PropertyAccessorElement? Function(String))
-    getMethod (method: MethodElement? Function(String))
-    getSetter (method: PropertyAccessorElement? Function(String))
-  ExtensionTypeElement (class extends Object implements InterfaceElement, deprecated):
-    new (constructor: ExtensionTypeElement Function())
-    augmented (getter: AugmentedExtensionTypeElement, deprecated)
-    primaryConstructor (getter: ConstructorElement, deprecated)
-    representation (getter: FieldElement)
-    typeErasure (getter: DartType)
   FieldElement (class extends Object implements ClassMemberElement, PropertyInducingElement, deprecated):
     new (constructor: FieldElement Function())
     declaration (getter: FieldElement)

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

@@ -60,36 +60,6 @@ import 'package:analyzer/src/task/api/model.dart' show AnalysisTarget;
 import 'package:meta/meta.dart';
 import 'package:pub_semver/pub_semver.dart';
 
-/// The result of applying augmentations to an [ExtensionElement].
-///
-/// Clients may not extend, implement or mix-in this class.
-@Deprecated(elementModelDeprecationMsg)
-abstract class AugmentedExtensionElement implements AugmentedInstanceElement {
-  /// The type that is extended by this extension.
-  DartType get extendedType;
-}
-
-/// The result of applying augmentations to an [ExtensionTypeElement].
-///
-/// Clients may not extend, implement or mix-in this class.
-@Deprecated(elementModelDeprecationMsg)
-abstract class AugmentedExtensionTypeElement
-    implements AugmentedInterfaceElement {
-  @override
-  ExtensionTypeElement get firstFragment;
-
-  /// The primary constructor of this extension.
-  ConstructorElement get primaryConstructor;
-
-  /// The representation of this extension.
-  FieldElement get representation;
-
-  /// The extension type erasure, obtained by recursively replacing every
-  /// subterm which is an extension type by the corresponding representation
-  /// type.
-  DartType get typeErasure;
-}
-
 /// The result of applying augmentations to a [InstanceElement].
 ///
 /// Clients may not extend, implement or mix-in this class.
@@ -255,9 +225,6 @@ abstract class ClassMemberElement implements Element {
 /// Clients may not extend, implement or mix-in this class.
 @Deprecated(elementModelDeprecationMsg)
 abstract class CompilationUnitElement implements UriReferencedElement {
-  /// The extension elements accessible within this unit.
-  List<ExtensionElement> get accessibleExtensions;
-
   /// The top-level accessors (getters and setters) declared in this
   /// compilation unit.
   List<PropertyAccessorElement> get accessors;
@@ -267,13 +234,6 @@ abstract class CompilationUnitElement implements UriReferencedElement {
   @override
   CompilationUnitElement? get enclosingElement3;
 
-  /// The extensions declared in this compilation unit.
-  List<ExtensionElement> get extensions;
-
-  /// The extension types declared in this compilation unit.
-  @experimental
-  List<ExtensionTypeElement> get extensionTypes;
-
   /// The top-level functions declared in this compilation unit.
   List<FunctionElement> get functions;
 
@@ -1106,61 +1066,6 @@ abstract class ExecutableElement implements FunctionTypedElement {
   String get name;
 }
 
-/// An element that represents an extension.
-///
-/// Clients may not extend, implement or mix-in this class.
-@Deprecated('Use ExtensionElement2 instead')
-abstract class ExtensionElement implements InstanceElement {
-  @Deprecated(elementModelDeprecationMsg)
-  @override
-  AugmentedExtensionElement get augmented;
-
-  /// The type that is extended by this extension.
-  DartType get extendedType;
-
-  /// Returns the element representing the field with the given [name] that is
-  /// declared in this extension, or `null` if this extension does not declare a
-  /// field with the given name.
-  FieldElement? getField(String name);
-
-  /// Returns the element representing the getter with the given [name] that is
-  /// declared in this extension, or `null` if this extension does not declare a
-  /// getter with the given name.
-  PropertyAccessorElement? getGetter(String name);
-
-  /// Returns the element representing the method with the given [name] that is
-  /// declared in this extension, or `null` if this extension does not declare a
-  /// method with the given name.
-  MethodElement? getMethod(String name);
-
-  /// Returns the element representing the setter with the given [name] that is
-  /// declared in this extension, or `null` if this extension does not declare a
-  /// setter with the given name.
-  PropertyAccessorElement? getSetter(String name);
-}
-
-/// An element that represents an extension type.
-///
-/// Clients may not extend, implement or mix-in this class.
-@Deprecated('Use ExtensionTypeElement2 instead')
-abstract class ExtensionTypeElement implements InterfaceElement {
-  @Deprecated(elementModelDeprecationMsg)
-  @override
-  AugmentedExtensionTypeElement get augmented;
-
-  /// The primary constructor of this extension.
-  @Deprecated(elementModelDeprecationMsg)
-  ConstructorElement get primaryConstructor;
-
-  /// The representation of this extension.
-  FieldElement get representation;
-
-  /// The extension type erasure, obtained by recursively replacing every
-  /// subterm which is an extension type by the corresponding representation
-  /// type.
-  DartType get typeErasure;
-}
-
 /// A field defined within a class.
 ///
 /// Clients may not extend, implement or mix-in this class.

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

@@ -89,40 +89,6 @@ mixin AugmentableFragment on ElementImpl {
   }
 }
 
-@Deprecated(elementModelDeprecationMsg)
-class AugmentedExtensionElementImpl extends AugmentedInstanceElementImpl
-    implements AugmentedExtensionElement {
-  AugmentedExtensionElementImpl(super.firstFragment);
-
-  @override
-  DartType get extendedType => firstFragment.extendedType;
-
-  @override
-  ExtensionElementImpl get firstFragment {
-    return super.firstFragment as ExtensionElementImpl;
-  }
-}
-
-@Deprecated(elementModelDeprecationMsg)
-class AugmentedExtensionTypeElementImpl extends AugmentedInterfaceElementImpl
-    implements AugmentedExtensionTypeElement {
-  AugmentedExtensionTypeElementImpl(super.firstFragment);
-
-  @override
-  ExtensionTypeElementImpl get firstFragment {
-    return super.firstFragment as ExtensionTypeElementImpl;
-  }
-
-  @override
-  ConstructorElement get primaryConstructor => firstFragment.primaryConstructor;
-
-  @override
-  FieldElement get representation => firstFragment.representation;
-
-  @override
-  DartType get typeErasure => firstFragment.typeErasure;
-}
-
 @Deprecated(elementModelDeprecationMsg)
 class AugmentedInstanceElementImpl implements AugmentedInstanceElement {
   @override
@@ -902,14 +868,6 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
     required this.lineInfo,
   }) : super(null, -1);
 
-  @Deprecated('Use accessibleExtensions2 instead')
-  @override
-  List<ExtensionElement> get accessibleExtensions {
-    return scope.accessibleExtensions
-        .map((e) => e.firstFragment as ExtensionElement)
-        .toList();
-  }
-
   @override
   List<ExtensionElement2> get accessibleExtensions2 {
     return scope.accessibleExtensions;
@@ -1009,7 +967,6 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
   @override
   List<EnumFragment> get enums2 => enums.cast<EnumFragment>();
 
-  @override
   List<ExtensionElementImpl> get extensions {
     return _extensions;
   }
@@ -1027,7 +984,6 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
   List<ExtensionFragment> get extensions2 =>
       extensions.cast<ExtensionFragment>();
 
-  @override
   List<ExtensionTypeElementImpl> get extensionTypes {
     return _extensionTypes;
   }
@@ -3943,22 +3899,14 @@ abstract class ExecutableElementOrMember
 }
 
 class ExtensionElementImpl extends InstanceElementImpl
-    implements
-        // ignore:deprecated_member_use_from_same_package,analyzer_use_new_elements
-        ExtensionElement,
-        ExtensionFragment {
+    implements ExtensionFragment {
   late ExtensionElementImpl2 augmentedInternal;
 
   /// Initialize a newly created extension element to have the given [name] at
   /// the given [nameOffset] in the file that contains the declaration of this
   /// element.
   ExtensionElementImpl(super.name, super.nameOffset);
 
-  @Deprecated(elementModelDeprecationMsg)
-  @override
-  AugmentedExtensionElement get augmented =>
-      AugmentedExtensionElementImpl(this);
-
   @Deprecated('Use Element2 instead')
   @override
   List<Element> get children => [
@@ -3986,7 +3934,6 @@ class ExtensionElementImpl extends InstanceElementImpl
     return augmentedInternal;
   }
 
-  @override
   TypeImpl get extendedType {
     return element.extendedType;
   }
@@ -4029,43 +3976,6 @@ class ExtensionElementImpl extends InstanceElementImpl
   void appendTo(ElementDisplayStringBuilder builder) {
     builder.writeExtensionElement(this);
   }
-
-  @Deprecated(elementModelDeprecationMsg)
-  @override
-  FieldElement? getField(String name) {
-    for (FieldElement fieldElement in fields) {
-      if (name == fieldElement.name) {
-        return fieldElement;
-      }
-    }
-    return null;
-  }
-
-  @override
-  PropertyAccessorElementOrMember? getGetter(String getterName) {
-    for (var accessor in accessors) {
-      if (accessor.isGetter && accessor.name == getterName) {
-        return accessor;
-      }
-    }
-    return null;
-  }
-
-  @override
-  MethodElementOrMember? getMethod(String methodName) {
-    for (var method in methods) {
-      if (method.name == methodName) {
-        return method;
-      }
-    }
-    return null;
-  }
-
-  @Deprecated(elementModelDeprecationMsg)
-  @override
-  PropertyAccessorElement? getSetter(String setterName) {
-    return InterfaceElementImpl.getSetterFromAccessors(setterName, accessors);
-  }
 }
 
 class ExtensionElementImpl2 extends InstanceElementImpl2
@@ -4105,13 +4015,9 @@ class ExtensionElementImpl2 extends InstanceElementImpl2
 }
 
 class ExtensionTypeElementImpl extends InterfaceElementImpl
-    implements
-        // ignore:deprecated_member_use_from_same_package,analyzer_use_new_elements
-        ExtensionTypeElement,
-        ExtensionTypeFragment {
+    implements ExtensionTypeFragment {
   late ExtensionTypeElementImpl2 augmentedInternal;
 
-  @override
   late DartType typeErasure;
 
   /// Whether the element has direct or indirect reference to itself,
@@ -4124,11 +4030,6 @@ class ExtensionTypeElementImpl extends InterfaceElementImpl
 
   ExtensionTypeElementImpl(super.name, super.nameOffset);
 
-  @Deprecated(elementModelDeprecationMsg)
-  @override
-  AugmentedExtensionTypeElement get augmented =>
-      AugmentedExtensionTypeElementImpl(this);
-
   @override
   ExtensionTypeElementImpl2 get element {
     linkedData?.read(this);
@@ -4148,7 +4049,6 @@ class ExtensionTypeElementImpl extends InterfaceElementImpl
   ExtensionTypeElementImpl? get previousFragment =>
       super.previousFragment as ExtensionTypeElementImpl?;
 
-  @override
   ConstructorElementImpl get primaryConstructor {
     return constructors.first;
   }
@@ -4157,7 +4057,6 @@ class ExtensionTypeElementImpl extends InterfaceElementImpl
   ConstructorFragment get primaryConstructor2 =>
       primaryConstructor as ConstructorFragment;
 
-  @override
   FieldElementImpl get representation {
     return fields.first;
   }