Elements. Remove V1 ExecutableElement.

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

Author: scheglov

pkg/analyzer/api.txt

@@ -2957,7 +2957,6 @@ package:analyzer/dart/constant/value.dart:
     getField (method: DartObject? Function(String))
     toBoolValue (method: bool? Function())
     toDoubleValue (method: double? Function())
-    toFunctionValue (method: ExecutableElement? Function(), deprecated)
     toFunctionValue2 (method: ExecutableElement2? Function(), experimental)
     toIntValue (method: int? Function())
     toListValue (method: List<DartObject>? Function())
@@ -3144,22 +3143,6 @@ package:analyzer/dart/element/element.dart:
     new (constructor: ElementLocation Function())
     components (getter: List<String>)
     encoding (getter: String)
-  ExecutableElement (class extends Object implements FunctionTypedElement, deprecated):
-    new (constructor: ExecutableElement Function())
-    declaration (getter: ExecutableElement)
-    displayName (getter: String)
-    enclosingElement3 (getter: Element)
-    hasImplicitReturnType (getter: bool)
-    isAbstract (getter: bool)
-    isAsynchronous (getter: bool)
-    isAugmentation (getter: bool)
-    isExtensionTypeMember (getter: bool)
-    isExternal (getter: bool)
-    isGenerator (getter: bool)
-    isOperator (getter: bool)
-    isStatic (getter: bool)
-    isSynchronous (getter: bool)
-    name (getter: String)
   FunctionTypedElement (class extends Object implements TypeParameterizedElement, deprecated):
     new (constructor: FunctionTypedElement Function())
     parameters (getter: List<ParameterElement>)

pkg/analyzer/lib/dart/constant/value.dart

@@ -100,15 +100,6 @@ abstract class DartObject {
   /// * the value of the object being represented is `null`.
   double? toDoubleValue();
 
-  /// Return an element corresponding to the value of the object being
-  /// represented, or `null`
-  /// if
-  /// * this object is not of a function type,
-  /// * the value of the object being represented is not known, or
-  /// * the value of the object being represented is `null`.
-  @Deprecated('Use toFunctionValue2() instead')
-  ExecutableElement? toFunctionValue();
-
   /// Return an element corresponding to the value of the object being
   /// represented, or `null`
   /// if

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

@@ -798,70 +798,6 @@ abstract class ElementLocation {
   String get encoding;
 }
 
-/// An element representing an executable object, including functions, methods,
-/// constructors, getters, and setters.
-///
-/// Clients may not extend, implement or mix-in this class.
-@Deprecated('Use ExecutableElement2 instead')
-abstract class ExecutableElement implements FunctionTypedElement {
-  @override
-  ExecutableElement get declaration;
-
-  @override
-  String get displayName;
-
-  @override
-  Element get enclosingElement3;
-
-  /// Whether the executable element did not have an explicit return type
-  /// specified for it in the original source.
-  bool get hasImplicitReturnType;
-
-  /// Whether the executable element is abstract.
-  ///
-  /// Executable elements are abstract if they are not external, and have no
-  /// body.
-  bool get isAbstract;
-
-  /// Whether the executable element has body marked as being asynchronous.
-  bool get isAsynchronous;
-
-  /// Whether the element is an augmentation.
-  ///
-  /// If `true`, declaration has the explicit `augment` modifier.
-  bool get isAugmentation;
-
-  /// Whether the executable element is an extension type member.
-  bool get isExtensionTypeMember;
-
-  /// Whether the executable element is external.
-  ///
-  /// Executable elements are external if they are explicitly marked as such
-  /// using the 'external' keyword.
-  bool get isExternal;
-
-  /// Whether the executable element has a body marked as being a generator.
-  bool get isGenerator;
-
-  /// Whether the executable element is an operator.
-  ///
-  /// The test may be based on the name of the executable element, in which
-  /// case the result will be correct when the name is legal.
-  bool get isOperator;
-
-  /// Whether the element is a static element.
-  ///
-  /// A static element is an element that is not associated with a particular
-  /// instance, but rather with an entire library or class.
-  bool get isStatic;
-
-  /// Whether the executable element has a body marked as being synchronous.
-  bool get isSynchronous;
-
-  @override
-  String get name;
-}
-
 /// An element that has a [FunctionType] as its [type].
 ///
 /// This also provides convenient access to the parameters and return type.

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

@@ -899,7 +899,12 @@ class DartObjectImpl implements DartObject, Constant {
     return null;
   }
 
-  @override
+  /// Return an element corresponding to the value of the object being
+  /// represented, or `null`
+  /// if
+  /// * this object is not of a function type,
+  /// * the value of the object being represented is not known, or
+  /// * the value of the object being represented is `null`.
   ExecutableElementOrMember? toFunctionValue() {
     return toFunctionValue2()?.asElement;
   }

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

@@ -3378,7 +3378,51 @@ class ElementLocationImpl implements ElementLocation {
 
 /// A shared internal interface of `Element` and [Member].
 /// Used during migration to avoid referencing `Element`.
-abstract class ElementOrMember {}
+abstract class ElementOrMember {
+  /// The declaration of this element.
+  ///
+  /// If the element is a view on an element, e.g. a method from an interface
+  /// type, with substituted type parameters, return the corresponding element
+  /// from the class, without any substitutions. If this element is already a
+  /// declaration (or a synthetic element, e.g. a synthetic property accessor),
+  /// return itself.
+  ElementOrMember? get declaration;
+
+  /// The display name of this element, possibly the empty string if the
+  /// element does not have a name.
+  ///
+  /// In most cases the name and the display name are the same. Differences
+  /// though are cases such as setters where the name of some setter `set f(x)`
+  /// is `f=`, instead of `f`.
+  String get displayName;
+
+  /// The element that either physically or logically encloses this element.
+  ///
+  /// For [LibraryElement] returns `null`, because libraries are the top-level
+  /// elements in the model.
+  ///
+  /// For [CompilationUnitElement] returns the [CompilationUnitElement] that
+  /// uses `part` directive to include this element, or `null` if this element
+  /// is the defining unit of the library.
+  @Deprecated('Use Element2.enclosingElement2 instead or '
+      'Fragment.enclosingFragment instead')
+  Element? get enclosingElement3;
+
+  /// The kind of element that this is.
+  ElementKind get kind;
+
+  /// The name of this element, or `null` if this element does not have a name.
+  String? get name;
+
+  /// The length of the name of this element in the file that contains the
+  /// declaration of this element, or `0` if this element does not have a name.
+  int get nameLength;
+
+  /// The offset of the name of this element in the file that contains the
+  /// declaration of this element, or `-1` if this element is synthetic, does
+  /// not have a name, or otherwise does not have an offset.
+  int get nameOffset;
+}
 
 /// An [InterfaceElementImpl] which is an enum.
 class EnumElementImpl extends InterfaceElementImpl implements EnumFragment {
@@ -3734,21 +3778,79 @@ abstract class ExecutableElementImpl2 extends FunctionTypedElementImpl2
 
 /// Common base class for all analyzer-internal classes that implement
 /// `ExecutableElement`.
-abstract class ExecutableElementOrMember
-    implements
-        // ignore:deprecated_member_use_from_same_package,analyzer_use_new_elements
-        ExecutableElement,
-        ElementOrMember {
+abstract class ExecutableElementOrMember implements ElementOrMember {
   @override
-  List<ParameterElementMixin> get parameters;
+  ExecutableElementOrMember get declaration;
 
   @override
-  TypeImpl get returnType;
+  String get displayName;
+
+  /// Whether the executable element did not have an explicit return type
+  /// specified for it in the original source.
+  bool get hasImplicitReturnType;
+
+  /// Whether the executable element is abstract.
+  ///
+  /// Executable elements are abstract if they are not external, and have no
+  /// body.
+  bool get isAbstract;
+
+  /// Whether the executable element has body marked as being asynchronous.
+  bool get isAsynchronous;
 
+  /// Whether the element is an augmentation.
+  ///
+  /// If `true`, declaration has the explicit `augment` modifier.
+  bool get isAugmentation;
+
+  /// Whether the executable element is an extension type member.
+  bool get isExtensionTypeMember;
+
+  /// Whether the executable element is external.
+  ///
+  /// Executable elements are external if they are explicitly marked as such
+  /// using the 'external' keyword.
+  bool get isExternal;
+
+  /// Whether the executable element has a body marked as being a generator.
+  bool get isGenerator;
+
+  /// Whether the executable element is an operator.
+  ///
+  /// The test may be based on the name of the executable element, in which
+  /// case the result will be correct when the name is legal.
+  bool get isOperator;
+
+  /// Whether the element is a static element.
+  ///
+  /// A static element is an element that is not associated with a particular
+  /// instance, but rather with an entire library or class.
+  bool get isStatic;
+
+  /// Whether the executable element has a body marked as being synchronous.
+  bool get isSynchronous;
+
+  /// The name of this element, or `null` if this element does not have a name.
   @override
+  String get name;
+
+  /// The parameters defined by this executable element.
+  List<ParameterElementMixin> get parameters;
+
+  /// The return type defined by this element.
+  TypeImpl get returnType;
+
+  /// Return the source associated with this target, or `null` if this target is
+  /// not associated with a source.
+  Source get source;
+
+  /// The type defined by this element.
   FunctionTypeImpl get type;
 
-  @override
+  /// The type parameters declared by this element directly.
+  ///
+  /// This does not include type parameters that are declared by any enclosing
+  /// elements.
   List<TypeParameterElementImpl> get typeParameters;
 }
 

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

@@ -672,7 +672,7 @@ class GetterMember extends PropertyAccessorMember
     if (setter is SetterMember) {
       return setter;
     }
-    return setter.asElement2 as SetterElementImpl?;
+    return setter?.asElement2 as SetterElementImpl?;
   }
 
   @override
@@ -1416,7 +1416,7 @@ class SetterMember extends PropertyAccessorMember
     if (getter is GetterMember) {
       return getter;
     }
-    return getter.asElement2 as GetterElementImpl?;
+    return getter?.asElement2 as GetterElementImpl?;
   }
 
   @override

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

@@ -188,8 +188,6 @@ extension Element2OrNullExtension on Element2? {
         return element2.asElement;
       case DynamicElementImpl2():
         return self.firstFragment;
-      case ExecutableMember element2:
-        return element2.asElement;
       case ExtensionElementImpl2 element2:
         return element2.asElement;
       case FieldElementImpl2 element2: