Elements. Remove V1 VariableElement.

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

Author: scheglov

pkg/analyzer/api.txt

@@ -2952,7 +2952,6 @@ package:analyzer/dart/constant/value.dart:
     hasKnownValue (getter: bool)
     isNull (getter: bool)
     type (getter: DartType?)
-    variable (getter: VariableElement?, deprecated)
     variable2 (getter: VariableElement2?)
     getField (method: DartObject? Function(String))
     toBoolValue (method: bool? Function())
@@ -3180,17 +3179,6 @@ package:analyzer/dart/element/element.dart:
     uri (getter: String?)
     uriEnd (getter: int)
     uriOffset (getter: int)
-  VariableElement (class extends Object implements Element, ConstantEvaluationTarget, deprecated):
-    new (constructor: VariableElement Function())
-    declaration (getter: VariableElement)
-    hasImplicitType (getter: bool)
-    isConst (getter: bool)
-    isFinal (getter: bool)
-    isLate (getter: bool)
-    isStatic (getter: bool)
-    name (getter: String)
-    type (getter: DartType)
-    computeConstantValue (method: DartObject? Function())
   _ExistingElement (class extends Object implements Element, deprecated):
     new (constructor: _ExistingElement Function())
     declaration (getter: Element, deprecated)

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

@@ -12,7 +12,6 @@
 /// [element model](../element/element.dart).
 library;
 
-import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:meta/meta.dart';
@@ -68,10 +67,6 @@ abstract class DartObject {
   /// would return `false` from [hasKnownValue].
   DartType? get type;
 
-  /// If this object is the value of a constant variable, the variable.
-  @Deprecated('Use variable2 instead')
-  VariableElement? get variable;
-
   /// If this object is the value of a constant variable, the variable.
   VariableElement2? get variable2;
 

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

@@ -42,7 +42,6 @@ import 'package:analyzer/dart/analysis/session.dart';
 import 'package:analyzer/dart/constant/value.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
-import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/dart/element/type_provider.dart';
 import 'package:analyzer/dart/element/type_system.dart';
 import 'package:analyzer/error/error.dart';
@@ -913,58 +912,6 @@ abstract class UriReferencedElement implements _ExistingElement {
   int get uriOffset;
 }
 
-/// A variable. There are more specific subclasses for more specific kinds of
-/// variables.
-///
-/// Clients may not extend, implement or mix-in this class.
-@Deprecated('Use VariableElement2 instead')
-abstract class VariableElement implements Element, ConstantEvaluationTarget {
-  @override
-  VariableElement get declaration;
-
-  /// Whether the variable element did not have an explicit type specified
-  /// for it.
-  bool get hasImplicitType;
-
-  /// Whether the variable was declared with the 'const' modifier.
-  bool get isConst;
-
-  /// Whether the variable was declared with the 'final' modifier.
-  ///
-  /// Variables that are declared with the 'const' modifier will return `false`
-  /// even though they are implicitly final.
-  bool get isFinal;
-
-  /// Whether the variable uses late evaluation semantics.
-  ///
-  /// This will always return `false` unless the experiment 'non-nullable' is
-  /// enabled.
-  bool get isLate;
-
-  /// Whether the element is a static variable, as per section 8 of the Dart
-  /// Language Specification:
-  ///
-  /// > A static variable is a variable that is not associated with a particular
-  /// > instance, but rather with an entire library or class. Static variables
-  /// > include library variables and class variables. Class variables are
-  /// > variables whose declaration is immediately nested inside a class
-  /// > declaration and includes the modifier static. A library variable is
-  /// > implicitly static.
-  bool get isStatic;
-
-  @override
-  String get name;
-
-  /// The declared type of this variable.
-  DartType get type;
-
-  /// Returns a representation of the value of this variable, forcing the value
-  /// to be computed if it had not previously been computed, or `null` if either
-  /// this variable was not declared with the 'const' modifier or if the value
-  /// of this variable could not be computed because of errors.
-  DartObject? computeConstantValue();
-}
-
 /// This class exists to provide non-nullable overrides for existing elements,
 /// as opposite to artificial "multiply defined" element.
 @Deprecated('Use Element2 instead')

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

@@ -180,7 +180,7 @@ class DartObjectImpl implements DartObject, Constant {
   /// The state of the object.
   final InstanceState state;
 
-  @override
+  /// If this object is the value of a constant variable, the variable.
   final VariableElementImpl? variable;
 
   /// Initialize a newly created object to have the given [type] and [state].

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

@@ -3373,6 +3373,12 @@ abstract class ElementOrMember {
   /// The kind of element that this is.
   ElementKind get kind;
 
+  /// All of the metadata associated with this element.
+  ///
+  /// The array will be empty if the element does not have any metadata or if
+  /// the library containing this element has not yet been resolved.
+  List<ElementAnnotation> get metadata;
+
   /// The name of this element, or `null` if this element does not have a name.
   String? get name;
 
@@ -5572,9 +5578,7 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   @override
   List<FieldElementImpl2> get fields2 {
     _readMembers();
-    return firstFragment.fields
-        .map((e) => e.asElement2 as FieldElementImpl2)
-        .toList();
+    return firstFragment.fields.map((e) => e.asElement2).toList();
   }
 
   @override
@@ -11051,15 +11055,51 @@ abstract class VariableElementImpl2 extends ElementImpl2
 /// Common base class for all analyzer-internal classes that implement
 /// `VariableElement`.
 abstract class VariableElementOrMember
-    implements
-        ElementOrMember,
-        // ignore:deprecated_member_use_from_same_package,analyzer_use_new_elements
-        VariableElement {
+    implements ElementOrMember, ConstantEvaluationTarget {
   @override
   VariableElementImpl get declaration;
 
+  /// Whether the variable element did not have an explicit type specified
+  /// for it.
+  bool get hasImplicitType;
+
+  /// Whether the variable was declared with the 'const' modifier.
+  bool get isConst;
+
+  /// Whether the variable was declared with the 'final' modifier.
+  ///
+  /// Variables that are declared with the 'const' modifier will return `false`
+  /// even though they are implicitly final.
+  bool get isFinal;
+
+  /// Whether the variable uses late evaluation semantics.
+  ///
+  /// This will always return `false` unless the experiment 'non-nullable' is
+  /// enabled.
+  bool get isLate;
+
+  /// Whether the element is a static variable, as per section 8 of the Dart
+  /// Language Specification:
+  ///
+  /// > A static variable is a variable that is not associated with a particular
+  /// > instance, but rather with an entire library or class. Static variables
+  /// > include library variables and class variables. Class variables are
+  /// > variables whose declaration is immediately nested inside a class
+  /// > declaration and includes the modifier static. A library variable is
+  /// > implicitly static.
+  bool get isStatic;
+
   @override
+  String get name;
+
+  /// The declared type of this variable.
   TypeImpl get type;
+
+  /// Returns a representation of the value of this variable, forcing the value
+  /// to be computed if it had not previously been computed, or `null` if either
+  /// this variable was not declared with the 'const' modifier or if the value
+  /// of this variable could not be computed because of errors.
+  DartObject? computeConstantValue();
 }
 
 mixin WrappedElementMixin implements ElementImpl2 {

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

@@ -702,8 +702,7 @@ class GetterMember extends PropertyAccessorMember
   }
 
   @override
-  PropertyInducingElement2OrMember? get variable3 =>
-      variable2.asElement2 as PropertyInducingElement2OrMember?;
+  PropertyInducingElement2OrMember? get variable3 => variable2?.asElement2;
 
   @override
   GetterElementImpl get _element2 {
@@ -1441,8 +1440,7 @@ class SetterMember extends PropertyAccessorMember
   }
 
   @override
-  PropertyInducingElement2OrMember? get variable3 =>
-      variable2.asElement2 as PropertyInducingElement2OrMember?;
+  PropertyInducingElement2OrMember? get variable3 => variable2?.asElement2;
 
   @override
   SetterElementImpl get _element2 {

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

@@ -351,6 +351,12 @@ extension FieldElementImpl2Extension on FieldElementImpl2 {
   }
 }
 
+extension FieldElementImplExtension on FieldElementImpl {
+  FieldElementImpl2 get asElement2 {
+    return element;
+  }
+}
+
 extension FieldElementOrMemberExtension on FieldElementOrMember {
   FieldElement2OrMember get asElement2 {
     return switch (this) {
@@ -592,6 +598,17 @@ extension PropertyInducingElementExtension on PropertyInducingElement2 {
   }
 }
 
+extension PropertyInducingElementOrMemberExtension
+    on PropertyInducingElementOrMember {
+  PropertyInducingElement2OrMember get asElement2 {
+    return switch (this) {
+      PropertyInducingElementImpl(:var element) => element,
+      FieldMember member => member,
+      _ => throw UnsupportedError('Unsupported type: $runtimeType'),
+    };
+  }
+}
+
 extension SetterElementImplExtension on SetterElementImpl {
   PropertyAccessorElementImpl get asElement {
     return lastFragment;