Elements. Remove V1 AugmentedXyz classes.

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

Author: scheglov

pkg/analyzer/api.txt

@@ -2968,27 +2968,6 @@ package:analyzer/dart/constant/value.dart:
     toSymbolValue (method: String? Function())
     toTypeValue (method: DartType? Function())
 package:analyzer/dart/element/element.dart:
-  AugmentedInstanceElement (class extends Object, deprecated):
-    new (constructor: AugmentedInstanceElement Function())
-    accessors (getter: List<PropertyAccessorElement>)
-    fields (getter: List<FieldElement>)
-    firstFragment (getter: InstanceElement)
-    metadata (getter: List<ElementAnnotation>)
-    methods (getter: List<MethodElement>)
-    thisType (getter: DartType)
-    getField (method: FieldElement? Function(String))
-    getGetter (method: PropertyAccessorElement? Function(String))
-    getMethod (method: MethodElement? Function(String))
-    getSetter (method: PropertyAccessorElement? Function(String))
-  AugmentedInterfaceElement (class extends Object implements AugmentedInstanceElement, deprecated):
-    new (constructor: AugmentedInterfaceElement Function())
-    firstFragment (getter: InterfaceElement)
-    interfaces (getter: List<InterfaceType>)
-    mixins (getter: List<InterfaceType>)
-    thisType (getter: InterfaceType)
-  AugmentedMixinElement (class extends AugmentedInterfaceElement, deprecated):
-    new (constructor: AugmentedMixinElement Function())
-    superclassConstraints (getter: List<InterfaceType>)
   BindPatternVariableElement (class extends Object implements PatternVariableElement, deprecated):
     new (constructor: BindPatternVariableElement Function())
   ClassMemberElement (class extends Object implements Element, deprecated):
@@ -3222,7 +3201,6 @@ package:analyzer/dart/element/element.dart:
   InstanceElement (class extends Object implements TypeDefiningElement, TypeParameterizedElement, deprecated):
     new (constructor: InstanceElement Function())
     accessors (getter: List<PropertyAccessorElement>)
-    augmented (getter: AugmentedInstanceElement, deprecated)
     enclosingElement3 (getter: CompilationUnitElement, deprecated)
     fields (getter: List<FieldElement>)
     isAugmentation (getter: bool)
@@ -3231,7 +3209,6 @@ package:analyzer/dart/element/element.dart:
   InterfaceElement (class extends Object implements InstanceElement, deprecated):
     new (constructor: InterfaceElement Function())
     allSupertypes (getter: List<InterfaceType>)
-    augmented (getter: AugmentedInterfaceElement, deprecated)
     interfaces (getter: List<InterfaceType>)
     mixins (getter: List<InterfaceType>, deprecated)
     name (getter: String)

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

@@ -60,90 +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 a [InstanceElement].
-///
-/// Clients may not extend, implement or mix-in this class.
-@Deprecated(elementModelDeprecationMsg)
-abstract class AugmentedInstanceElement {
-  /// The accessors (getters and setters) declared in this element.
-  ///
-  /// [PropertyAccessorElement]s replace corresponding elements,
-  /// other [PropertyAccessorElement]s are appended.
-  List<PropertyAccessorElement> get accessors;
-
-  /// The fields declared in this element.
-  ///
-  /// `FieldAugmentationElement`s replace corresponding elements, other
-  /// [FieldElement]s are appended.
-  List<FieldElement> get fields;
-
-  /// The declaration (not augmentation) that owns this result.
-  InstanceElement get firstFragment;
-
-  /// The metadata associated with this element.
-  ///
-  /// This is a union of annotations associated with the class declaration and
-  /// all its augmentations.
-  List<ElementAnnotation> get metadata;
-
-  /// The methods declared in this element.
-  ///
-  /// `MethodAugmentationElement`s replace corresponding elements, other
-  /// [MethodElement]s are appended.
-  List<MethodElement> get methods;
-
-  /// The type of `this` expression.
-  DartType get thisType;
-
-  /// Returns the field from [fields] that has the given [name].
-  FieldElement? getField(String name);
-
-  /// Returns the getter from [accessors] that has the given [name].
-  PropertyAccessorElement? getGetter(String name);
-
-  /// Returns the method from [methods] that has the given [name].
-  MethodElement? getMethod(String name);
-
-  /// Returns the setter from [accessors] that has the given [name].
-  PropertyAccessorElement? getSetter(String name);
-}
-
-/// The result of applying augmentations to a [InterfaceElement].
-///
-/// Clients may not extend, implement or mix-in this class.
-@Deprecated(elementModelDeprecationMsg)
-abstract class AugmentedInterfaceElement implements AugmentedInstanceElement {
-  @override
-  InterfaceElement get firstFragment;
-
-  /// The interfaces implemented by this element.
-  ///
-  /// This is a union of interfaces declared by the class declaration and
-  /// all its augmentations.
-  List<InterfaceType> get interfaces;
-
-  /// The mixins applied by this class or in its augmentations.
-  ///
-  /// This is a union of mixins applied by the class declaration and all its
-  /// augmentations.
-  List<InterfaceType> get mixins;
-
-  @override
-  InterfaceType get thisType;
-}
-
-/// The result of applying augmentations to a [MixinElement].
-///
-/// Clients may not extend, implement or mix-in this class.
-@Deprecated(elementModelDeprecationMsg)
-abstract class AugmentedMixinElement extends AugmentedInterfaceElement {
-  /// The superclass constraints of this element.
-  ///
-  /// This is a union of constraints declared by the class declaration and
-  /// all its augmentations.
-  List<InterfaceType> get superclassConstraints;
-}
-
 /// A pattern variable that is explicitly declared.
 ///
 /// Clients may not extend, implement or mix-in this class.
@@ -1093,13 +1009,6 @@ abstract class InstanceElement
   /// The declared accessors (getters and setters).
   List<PropertyAccessorElement> get accessors;
 
-  /// The result of merging augmentations.
-  ///
-  /// It includes the members of the base element and its augmentations as
-  /// specified by the merge operations.
-  @Deprecated(elementModelDeprecationMsg)
-  AugmentedInstanceElement get augmented;
-
   @Deprecated(elementModelDeprecationMsg)
   @override
   CompilationUnitElement get enclosingElement3;
@@ -1131,10 +1040,6 @@ abstract class InterfaceElement implements InstanceElement {
   /// This includes superclasses, mixins, interfaces, and superclass constraints.
   List<InterfaceType> get allSupertypes;
 
-  @Deprecated(elementModelDeprecationMsg)
-  @override
-  AugmentedInterfaceElement get augmented;
-
   /// The interfaces that are implemented by this class.
   ///
   /// <b>Note:</b> Because the element model represents the state of the code,

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

@@ -89,75 +89,6 @@ mixin AugmentableFragment on ElementImpl {
   }
 }
 
-@Deprecated(elementModelDeprecationMsg)
-class AugmentedInstanceElementImpl implements AugmentedInstanceElement {
-  @override
-  final InstanceElementImpl firstFragment;
-
-  AugmentedInstanceElementImpl(this.firstFragment);
-
-  @override
-  List<PropertyAccessorElement> get accessors => firstFragment.accessors;
-
-  @override
-  List<FieldElement> get fields => firstFragment.fields;
-
-  @override
-  List<ElementAnnotation> get metadata => firstFragment.metadata;
-
-  @override
-  List<MethodElement> get methods => firstFragment.methods;
-
-  @override
-  DartType get thisType => firstFragment.thisType;
-
-  @override
-  FieldElement? getField(String name) {
-    return fields.firstWhereOrNull((e) => e.name == name);
-  }
-
-  @override
-  PropertyAccessorElement? getGetter(String name) {
-    return accessors
-        .where((e) => e.isGetter)
-        .firstWhereOrNull((e) => e.name == name);
-  }
-
-  @override
-  MethodElement? getMethod(String name) {
-    return methods.firstWhereOrNull((e) => e.name == name);
-  }
-
-  @override
-  PropertyAccessorElement? getSetter(String name) {
-    return accessors
-        .where((e) => e.isSetter)
-        .firstWhereOrNull((e) => e.name == name);
-  }
-}
-
-@Deprecated(elementModelDeprecationMsg)
-class AugmentedInterfaceElementImpl extends AugmentedInstanceElementImpl
-    implements AugmentedInterfaceElement {
-  AugmentedInterfaceElementImpl(super.firstFragment);
-
-  @override
-  InterfaceElementImpl get firstFragment {
-    return super.firstFragment as InterfaceElementImpl;
-  }
-
-  @override
-  List<InterfaceType> get interfaces => firstFragment.interfaces;
-
-  @override
-  List<InterfaceType> get mixins => firstFragment.mixins;
-
-  @override
-  InterfaceType get thisType {
-    return super.thisType as InterfaceType;
-  }
-}
-
 class BindPatternVariableElementImpl extends PatternVariableElementImpl
     implements
         // ignore: deprecated_member_use_from_same_package,analyzer_use_new_elements
@@ -5560,10 +5491,6 @@ abstract class InstanceElementImpl extends _ExistingElementImpl
     _accessors = accessors;
   }
 
-  @Deprecated(elementModelDeprecationMsg)
-  @override
-  AugmentedInstanceElement get augmented => AugmentedInstanceElementImpl(this);
-
   @override
   InstanceElementImpl2 get element;
 
@@ -5948,11 +5875,6 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
         library.session.classHierarchy.implementedInterfaces(element);
   }
 
-  @Deprecated(elementModelDeprecationMsg)
-  @override
-  AugmentedInterfaceElement get augmented =>
-      AugmentedInterfaceElementImpl(this);
-
   @Deprecated('Use Element2 instead')
   @override
   List<Element> get children => [