Elements. Deprecate 'augmented'.

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

Author: scheglov

pkg/analyzer/api.txt

@@ -3019,9 +3019,6 @@ package:analyzer/dart/element/element.dart:
     getGetter (method: PropertyAccessorElement? Function(String))
     getMethod (method: MethodElement? Function(String))
     getSetter (method: PropertyAccessorElement? Function(String))
-    lookUpGetter (method: PropertyAccessorElement? Function({required LibraryElement library, required String name}))
-    lookUpMethod (method: MethodElement? Function({required LibraryElement library, required String name}))
-    lookUpSetter (method: PropertyAccessorElement? Function({required LibraryElement library, required String name}))
   AugmentedInterfaceElement (class extends Object implements AugmentedInstanceElement):
     new (constructor: AugmentedInterfaceElement Function())
     constructors (getter: List<ConstructorElement>)
@@ -3040,7 +3037,6 @@ package:analyzer/dart/element/element.dart:
     new (constructor: ClassElement Function())
     augmentation (getter: ClassElement?, experimental)
     augmentationTarget (getter: ClassElement?, experimental)
-    augmented (getter: AugmentedClassElement, experimental)
     hasNonFinalField (getter: bool)
     isAbstract (getter: bool)
     isBase (getter: bool)
@@ -3296,7 +3292,6 @@ package:analyzer/dart/element/element.dart:
     new (constructor: EnumElement Function())
     augmentation (getter: EnumElement?, experimental)
     augmentationTarget (getter: EnumElement?, experimental)
-    augmented (getter: AugmentedEnumElement, experimental)
   ExecutableElement (class extends Object implements FunctionTypedElement):
     new (constructor: ExecutableElement Function())
     augmentation (getter: ExecutableElement?, experimental)
@@ -3319,7 +3314,6 @@ package:analyzer/dart/element/element.dart:
     new (constructor: ExtensionElement Function())
     augmentation (getter: ExtensionElement?, experimental)
     augmentationTarget (getter: ExtensionElement?, experimental)
-    augmented (getter: AugmentedExtensionElement, experimental)
     extendedType (getter: DartType)
     getField (method: FieldElement? Function(String))
     getGetter (method: PropertyAccessorElement? Function(String))
@@ -3329,7 +3323,6 @@ package:analyzer/dart/element/element.dart:
     new (constructor: ExtensionTypeElement Function())
     augmentation (getter: ExtensionTypeElement?, experimental)
     augmentationTarget (getter: ExtensionTypeElement?, experimental)
-    augmented (getter: AugmentedExtensionTypeElement, experimental)
     primaryConstructor (getter: ConstructorElement)
     representation (getter: FieldElement)
     typeErasure (getter: DartType)
@@ -3377,7 +3370,6 @@ package:analyzer/dart/element/element.dart:
     accessors (getter: List<PropertyAccessorElement>)
     augmentation (getter: InstanceElement?, experimental)
     augmentationTarget (getter: InstanceElement?, experimental)
-    augmented (getter: AugmentedInstanceElement, experimental)
     enclosingElement3 (getter: CompilationUnitElement)
     fields (getter: List<FieldElement>)
     isAugmentation (getter: bool)
@@ -3387,7 +3379,6 @@ package:analyzer/dart/element/element.dart:
     new (constructor: InterfaceElement Function())
     allSupertypes (getter: List<InterfaceType>)
     augmentationTarget (getter: InterfaceElement?)
-    augmented (getter: AugmentedInterfaceElement, experimental)
     constructors (getter: List<ConstructorElement>)
     interfaces (getter: List<InterfaceType>)
     mixins (getter: List<InterfaceType>)
@@ -3477,7 +3468,6 @@ package:analyzer/dart/element/element.dart:
     new (constructor: MixinElement Function())
     augmentation (getter: MixinElement?, experimental)
     augmentationTarget (getter: MixinElement?, experimental)
-    augmented (getter: AugmentedMixinElement, experimental)
     isBase (getter: bool)
     superclassConstraints (getter: List<InterfaceType>)
     isImplementableIn (method: bool Function(LibraryElement))

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

@@ -151,39 +151,6 @@ abstract class AugmentedInstanceElement {
 
   /// Returns the setter from [accessors] that has the given [name].
   PropertyAccessorElement? getSetter(String name);
-
-  /// Returns the element representing the getter that results from looking up
-  /// the given [name] in this class with respect to the given [library],
-  /// or `null` if the look up fails.
-  ///
-  /// The behavior of this method is defined by the Dart Language Specification
-  /// in section 17.18 Lookup.
-  PropertyAccessorElement? lookUpGetter({
-    required String name,
-    required LibraryElement library,
-  });
-
-  /// Returns the element representing the method that results from looking up
-  /// the given [name] in this class with respect to the given [library],
-  /// or `null` if the look up fails.
-  ///
-  /// The behavior of this method is defined by the Dart Language Specification
-  /// in section 17.18 Lookup.
-  MethodElement? lookUpMethod({
-    required String name,
-    required LibraryElement library,
-  });
-
-  /// Returns the element representing the setter that results from looking up
-  /// the given [name] in this class with respect to the given [library],
-  /// or `null` if the look up fails.
-  ///
-  /// The behavior of this method is defined by the Dart Language Specification
-  /// in section 17.18 Lookup.
-  PropertyAccessorElement? lookUpSetter({
-    required String name,
-    required LibraryElement library,
-  });
 }
 
 /// The result of applying augmentations to a [InterfaceElement].
@@ -251,10 +218,6 @@ abstract class ClassElement implements InterfaceElement {
   @override
   ClassElement? get augmentationTarget;
 
-  @experimental
-  @override
-  AugmentedClassElement get augmented;
-
   /// Whether the class or its superclass declares a non-final instance field.
   bool get hasNonFinalField;
 
@@ -1262,10 +1225,6 @@ abstract class EnumElement implements InterfaceElement {
   @experimental
   @override
   EnumElement? get augmentationTarget;
-
-  @experimental
-  @override
-  AugmentedEnumElement get augmented;
 }
 
 /// An element representing an executable object, including functions, methods,
@@ -1359,10 +1318,6 @@ abstract class ExtensionElement implements InstanceElement {
   @override
   ExtensionElement? get augmentationTarget;
 
-  @experimental
-  @override
-  AugmentedExtensionElement get augmented;
-
   /// The type that is extended by this extension.
   DartType get extendedType;
 
@@ -1400,10 +1355,6 @@ abstract class ExtensionTypeElement implements InterfaceElement {
   @override
   ExtensionTypeElement? get augmentationTarget;
 
-  @experimental
-  @override
-  AugmentedExtensionTypeElement get augmented;
-
   /// The primary constructor of this extension.
   ConstructorElement get primaryConstructor;
 
@@ -1577,13 +1528,6 @@ abstract class InstanceElement
   @experimental
   InstanceElement? get augmentationTarget;
 
-  /// The result of merging augmentations.
-  ///
-  /// It includes the members of the base element and its augmentations as
-  /// specified by the merge operations.
-  @experimental
-  AugmentedInstanceElement get augmented;
-
   @override
   CompilationUnitElement get enclosingElement3;
 
@@ -1616,10 +1560,6 @@ abstract class InterfaceElement implements InstanceElement {
   @override
   InterfaceElement? get augmentationTarget;
 
-  @experimental
-  @override
-  AugmentedInterfaceElement get augmented;
-
   /// The declared constructors.
   ///
   /// The list is empty for [MixinElement].
@@ -2099,10 +2039,6 @@ abstract class MixinElement implements InterfaceElement {
   @override
   MixinElement? get augmentationTarget;
 
-  @experimental
-  @override
-  AugmentedMixinElement get augmented;
-
   /// Whether the mixin is a base mixin.
   ///
   /// A mixin is a base mixin if it has an explicit `base` modifier.

pkg/analyzer/lib/src/dart/constant/evaluation.dart

@@ -2956,8 +2956,9 @@ class _InstanceCreationEvaluator {
   }) {
     var superclass = definingType.superclass;
     if (superclass != null && !superclass.isDartCoreObject) {
-      var superConstructor =
-          superclass.lookUpConstructor(superName, _constructor.library);
+      var superConstructor = superclass
+          .lookUpConstructor2(superName, _constructor.library.asElement2)
+          ?.asElement;
       if (superConstructor == null) {
         return null;
       }