Elements. Remove AugmentedXyzElement classes.

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

Author: scheglov

pkg/analyzer/api.txt

@@ -2992,31 +2992,6 @@ package:analyzer/dart/constant/value.dart:
     toSymbolValue (method: String? Function())
     toTypeValue (method: DartType? Function())
 package:analyzer/dart/element/element.dart:
-  AugmentedClassElement (class extends Object implements AugmentedInterfaceElement):
-    new (constructor: AugmentedClassElement Function())
-    firstFragment (getter: ClassElement)
-  AugmentedEnumElement (class extends Object implements AugmentedInterfaceElement):
-    new (constructor: AugmentedEnumElement Function())
-    constants (getter: List<FieldElement>)
-    firstFragment (getter: EnumElement)
-  AugmentedExtensionElement (class extends Object implements AugmentedInstanceElement):
-    new (constructor: AugmentedExtensionElement Function())
-    extendedType (getter: DartType)
-  AugmentedExtensionTypeElement (class extends Object implements AugmentedInterfaceElement):
-    new (constructor: AugmentedExtensionTypeElement Function())
-    firstFragment (getter: ExtensionTypeElement)
-  AugmentedInstanceElement (class extends Object):
-    new (constructor: AugmentedInstanceElement Function())
-    firstFragment (getter: InstanceElement)
-    metadata (getter: List<ElementAnnotation>)
-    thisType (getter: DartType)
-  AugmentedInterfaceElement (class extends Object implements AugmentedInstanceElement):
-    new (constructor: AugmentedInterfaceElement Function())
-    firstFragment (getter: InterfaceElement)
-    thisType (getter: InterfaceType)
-  AugmentedMixinElement (class extends AugmentedInterfaceElement):
-    new (constructor: AugmentedMixinElement Function())
-    superclassConstraints (getter: List<InterfaceType>)
   BindPatternVariableElement (class extends Object implements PatternVariableElement):
     new (constructor: BindPatternVariableElement Function())
   ClassElement (class extends Object implements InterfaceElement):

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

@@ -59,81 +59,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 [ClassElement].
-///
-/// Clients may not extend, implement or mix-in this class.
-abstract class AugmentedClassElement implements AugmentedInterfaceElement {
-  @override
-  ClassElement get firstFragment;
-}
-
-/// The result of applying augmentations to an [EnumElement].
-///
-/// Clients may not extend, implement or mix-in this class.
-abstract class AugmentedEnumElement implements AugmentedInterfaceElement {
-  /// The enum constants declared in this element.
-  List<FieldElement> get constants;
-
-  @override
-  EnumElement get firstFragment;
-}
-
-/// The result of applying augmentations to an [ExtensionElement].
-///
-/// Clients may not extend, implement or mix-in this class.
-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.
-abstract class AugmentedExtensionTypeElement
-    implements AugmentedInterfaceElement {
-  @override
-  ExtensionTypeElement get firstFragment;
-}
-
-/// The result of applying augmentations to a [InstanceElement].
-///
-/// Clients may not extend, implement or mix-in this class.
-abstract class AugmentedInstanceElement {
-  /// 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 type of `this` expression.
-  DartType get thisType;
-}
-
-/// The result of applying augmentations to a [InterfaceElement].
-///
-/// Clients may not extend, implement or mix-in this class.
-abstract class AugmentedInterfaceElement implements AugmentedInstanceElement {
-  @override
-  InterfaceElement get firstFragment;
-
-  @override
-  InterfaceType get thisType;
-}
-
-/// The result of applying augmentations to a [MixinElement].
-///
-/// Clients may not extend, implement or mix-in this class.
-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.

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

@@ -585,8 +585,7 @@ class ClassElementImpl extends ClassOrMixinElementImpl
   }
 }
 
-class ClassElementImpl2 extends InterfaceElementImpl2
-    implements AugmentedClassElement, ClassElement2 {
+class ClassElementImpl2 extends InterfaceElementImpl2 implements ClassElement2 {
   @override
   final Reference reference;
 
@@ -3709,8 +3708,7 @@ class EnumElementImpl extends InterfaceElementImpl
   }
 }
 
-class EnumElementImpl2 extends InterfaceElementImpl2
-    implements AugmentedEnumElement, EnumElement2 {
+class EnumElementImpl2 extends InterfaceElementImpl2 implements EnumElement2 {
   @override
   final Reference reference;
 
@@ -3722,11 +3720,6 @@ class EnumElementImpl2 extends InterfaceElementImpl2
     firstFragment.augmentedInternal = this;
   }
 
-  @override
-  List<FieldElementOrMember> get constants {
-    return constants2.map((e) => e.asElement).toList();
-  }
-
   @override
   List<FieldElementImpl2> get constants2 {
     return fields2.where((field) => field.isEnumConstant).toList();
@@ -4135,7 +4128,7 @@ class ExtensionElementImpl extends InstanceElementImpl
 
 class ExtensionElementImpl2 extends InstanceElementImpl2
     with _HasSinceSdkVersionMixin
-    implements AugmentedExtensionElement, ExtensionElement2 {
+    implements ExtensionElement2 {
   @override
   final Reference reference;
 
@@ -4241,7 +4234,7 @@ class ExtensionTypeElementImpl extends InterfaceElementImpl
 }
 
 class ExtensionTypeElementImpl2 extends InterfaceElementImpl2
-    implements AugmentedExtensionTypeElement, ExtensionTypeElement2 {
+    implements ExtensionTypeElement2 {
   @override
   final Reference reference;
 
@@ -5832,10 +5825,7 @@ abstract class InstanceElementImpl extends _ExistingElementImpl
 }
 
 abstract class InstanceElementImpl2 extends ElementImpl2
-    implements
-        AugmentedInstanceElement,
-        InstanceElement2,
-        TypeParameterizedElement2 {
+    implements InstanceElement2, TypeParameterizedElement2 {
   @override
   InstanceElement2 get baseElement => this;
 
@@ -5900,9 +5890,6 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   @override
   LibraryElementImpl get library2 => firstFragment.library2!;
 
-  @override
-  List<ElementAnnotation> get metadata => firstFragment.metadata;
-
   @override
   Metadata get metadata2 => firstFragment.metadata2;
 
@@ -6547,7 +6534,7 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
 
 abstract class InterfaceElementImpl2 extends InstanceElementImpl2
     with _HasSinceSdkVersionMixin
-    implements AugmentedInterfaceElement, InterfaceElement2 {
+    implements InterfaceElement2 {
   /// The non-nullable instance of this element, without alias.
   /// Should be used only when the element has no type parameters.
   InterfaceTypeImpl? _nonNullableInstance;
@@ -8653,8 +8640,7 @@ class MixinElementImpl extends ClassOrMixinElementImpl
   }
 }
 
-class MixinElementImpl2 extends InterfaceElementImpl2
-    implements AugmentedMixinElement, MixinElement2 {
+class MixinElementImpl2 extends InterfaceElementImpl2 implements MixinElement2 {
   @override
   final Reference reference;
 

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

@@ -697,7 +697,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
       }
 
       if (!declaredFragment.isAugmentation) {
-        if (element.constants.isEmpty) {
+        if (element.constants2.isEmpty) {
           errorReporter.atToken(
             node.name,
             CompileTimeErrorCode.ENUM_WITHOUT_CONSTANTS,

pkg/analyzer/test/src/summary/element_text.dart

@@ -2054,10 +2054,6 @@ class _ElementWriter extends _AbstractElementWriter {
         case EnumElementImpl2():
           _elementPrinter.writeTypeList('mixins', element.mixins);
           _elementPrinter.writeTypeList('interfaces', element.interfaces);
-          _elementPrinter.writeElementList(
-            'constants',
-            element.constants.sortedBy((e) => e.name),
-          );
         case ExtensionElementImpl2():
           break;
         case ExtensionTypeElementImpl2():