Elements. Deprecate V1 APIs in dart/element/type.dart

Add InterfaceType.getGetter2() and getSetter2().

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

Author: scheglov

pkg/analysis_server/lib/src/services/correction/dart/create_missing_overrides.dart

@@ -19,9 +19,8 @@ class CreateMissingOverrides extends ResolvedCorrectionProducer {
 
   @override
   CorrectionApplicability get applicability =>
-          // TODO(applicability): comment on why.
-          CorrectionApplicability
-          .singleLocation;
+      // TODO(applicability): comment on why.
+      CorrectionApplicability.singleLocation;
 
   @override
   List<String> get fixArguments => [
@@ -44,9 +43,7 @@ class CreateMissingOverrides extends ResolvedCorrectionProducer {
     }
     var signatures = [
       ...InheritanceOverrideVerifier.missingOverrides2(targetDeclaration),
-      ...InheritanceOverrideVerifier.missingMustBeOverridden2(
-        targetDeclaration,
-      ),
+      ...InheritanceOverrideVerifier.missingMustBeOverridden(targetDeclaration),
     ];
     // Sort by name, getters before setters.
     signatures.sort((ExecutableElement2 a, ExecutableElement2 b) {

pkg/analyzer/api.txt

@@ -4424,9 +4424,11 @@ package:analyzer/dart/element/type.dart:
     superclass (getter: InterfaceType?)
     superclassConstraints (getter: List<InterfaceType>)
     getGetter (method: PropertyAccessorElement? Function(String))
+    getGetter2 (method: GetterElement? Function(String))
     getMethod (method: MethodElement? Function(String))
     getMethod2 (method: MethodElement2? Function(String))
     getSetter (method: PropertyAccessorElement? Function(String))
+    getSetter2 (method: SetterElement? Function(String))
     lookUpConstructor (method: ConstructorElement? Function(String?, LibraryElement))
     lookUpConstructor2 (method: ConstructorElement2? Function(String?, LibraryElement2))
     lookUpGetter2 (method: PropertyAccessorElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}))

pkg/analyzer/lib/dart/analysis/session.dart

@@ -2,7 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// ignore_for_file: analyzer_use_new_elements
 import 'package:analyzer/dart/analysis/analysis_context.dart';
 import 'package:analyzer/dart/analysis/declared_variables.dart';
 import 'package:analyzer/dart/analysis/results.dart';
@@ -54,6 +53,7 @@ abstract class AnalysisSession {
 
   /// Return information about the results of parsing units of the library file
   /// with the given library [element].
+  @Deprecated('Use getParsedLibraryByElement2() instead')
   SomeParsedLibraryResult getParsedLibraryByElement(LibraryElement element);
 
   /// Return information about the results of parsing units of the library file
@@ -74,6 +74,7 @@ abstract class AnalysisSession {
   /// resolving all of the files in the library with the library [element].
   ///
   /// Throw [ArgumentError] if the [element] was not produced by this session.
+  @Deprecated('Use getResolvedLibraryByElement2() instead')
   Future<SomeResolvedLibraryResult> getResolvedLibraryByElement(
       LibraryElement element);
 

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

@@ -12,7 +12,6 @@
 /// [element model](../element/element.dart).
 library;
 
-// ignore_for_file: analyzer_use_new_elements, as_much_as_we_can
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
@@ -70,6 +69,7 @@ abstract class DartObject {
   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.
@@ -106,6 +106,7 @@ abstract class DartObject {
   /// * 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

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

@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// ignore_for_file: analyzer_use_new_elements
-
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/utilities/extensions/element.dart';
@@ -24,9 +22,12 @@ abstract class Scope {
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class ScopeLookupResult {
+  @Deprecated('Use getter2 instead')
   Element? get getter => getter2?.asElement;
+
   Element2? get getter2;
 
+  @Deprecated('Use setter2 instead')
   Element? get setter => setter2?.asElement;
 
   Element2? get setter2;

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

@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// ignore_for_file: analyzer_use_new_elements
-
 /// Defines the type model. The type model is part of the
 /// [element model](../dart_element_element/dart_element_element-library.html)
 /// in that most types are defined by Dart code (the types `dynamic` and `void`
@@ -14,7 +12,7 @@
 /// interface defined by a class (an instance of [InterfaceType]) or the type of
 /// a function (an instance of [FunctionType]).
 ///
-/// We make a distinction between the declaration of a class (a [ClassElement])
+/// We make a distinction between the declaration of a class (a [ClassElement2])
 /// and the type defined by that class (an [InterfaceType]). The biggest reason
 /// for the distinction is to allow us to more cleanly represent the distinction
 /// between type parameters and type arguments. For example, if we define a
@@ -41,6 +39,7 @@ abstract class DartType {
 
   /// Return the element representing the declaration of this type, or `null`
   /// if the type is not associated with an element.
+  @Deprecated('Use element3 instead')
   Element? get element;
 
   /// Return the element representing the declaration of this type, or `null`
@@ -171,6 +170,7 @@ abstract class DartType {
   ///
   /// For a [TypeParameterType] with a bound (declared or promoted), returns
   /// the interface implemented by the bound.
+  @Deprecated('Use asInstanceOf2() instead')
   InterfaceType? asInstanceOf(InterfaceElement element);
 
   /// Return the canonical interface that this type implements for [element],
@@ -271,6 +271,7 @@ abstract class FunctionType implements DartType {
   ///
   /// The parameter types are not necessarily in the same order as they appear
   /// in the declaration of the function.
+  @Deprecated('Use formalParameters instead')
   List<ParameterElement> get parameters;
 
   /// All the positional parameter types, starting with the required ones, and
@@ -307,11 +308,7 @@ abstract class FunctionType implements DartType {
 
   /// The formal type parameters of this generic function; for example,
   /// `<T> T -> T`.
-  //
-  // TODO(scheglov): Remove the mention for "typeParameters".
-  // These are distinct from the `typeParameters` list, which contains type
-  // parameters from surrounding contexts, and thus are free type variables
-  // from the perspective of this function type.
+  @Deprecated('Use typeParameters instead')
   List<TypeParameterElement> get typeFormals;
 
   /// The type parameters.
@@ -325,18 +322,19 @@ abstract class FunctionType implements DartType {
   FunctionType instantiate(List<DartType> argumentTypes);
 }
 
-/// Information about an instantiated [TypeAliasElement] and the type
+/// Information about an instantiated [TypeAliasElement2] and the type
 /// arguments with which it is instantiated.
 abstract class InstantiatedTypeAliasElement {
   /// The alias element that is instantiated to produce a [DartType].
+  @Deprecated('Use element2 instead')
   TypeAliasElement get element;
 
   /// The alias element that is instantiated to produce a [DartType].
   @experimental
   TypeAliasElement2 get element2;
 
-  /// The type arguments with which the [element] was instantiated.
-  /// This list will be empty if the [element] is not generic.
+  /// The type arguments with which the [element2] was instantiated.
+  /// This list will be empty if the [element2] is not generic.
   List<DartType> get typeArguments;
 }
 
@@ -347,19 +345,22 @@ abstract class InstantiatedTypeAliasElement {
 abstract class InterfaceType implements ParameterizedType {
   /// Return a list containing all of the accessors (getters and setters)
   /// declared in this type.
+  @Deprecated('Use getters or setters instead')
   List<PropertyAccessorElement> get accessors;
 
   /// Return all the super-interfaces implemented by this interface. This
   /// includes superclasses, mixins, interfaces, and superclass constraints.
   List<InterfaceType> get allSupertypes;
 
   /// Return a list containing all of the constructors declared in this type.
+  @Deprecated('Use constructors2 instead')
   List<ConstructorElement> get constructors;
 
   /// Return a list containing all of the constructors declared in this type.
   @experimental
   List<ConstructorElement2> get constructors2;
 
+  @Deprecated('Use element3 instead')
   @override
   InterfaceElement get element;
 
@@ -378,6 +379,7 @@ abstract class InterfaceType implements ParameterizedType {
   List<InterfaceType> get interfaces;
 
   /// Return a list containing all of the methods declared in this type.
+  @Deprecated('Use methods2 instead')
   List<MethodElement> get methods;
 
   /// Return a list containing all of the methods declared in this type.
@@ -410,11 +412,18 @@ abstract class InterfaceType implements ParameterizedType {
   /// Return the element representing the getter with the given [name] that is
   /// declared in this class, or `null` if this class does not declare a getter
   /// with the given name.
+  @Deprecated('Use getGetter2() instead')
   PropertyAccessorElement? getGetter(String name);
 
+  /// Return the element representing the getter with the given [name] that is
+  /// declared in this class, or `null` if this class does not declare a getter
+  /// with the given name.
+  GetterElement? getGetter2(String name);
+
   /// Return the element representing the method with the given [name] that is
   /// declared in this class, or `null` if this class does not declare a method
   /// with the given name.
+  @Deprecated('Use getMethod2() instead')
   MethodElement? getMethod(String name);
 
   /// Return the element representing the method with the given [name] that is
@@ -425,8 +434,14 @@ abstract class InterfaceType implements ParameterizedType {
   /// Return the element representing the setter with the given [name] that is
   /// declared in this class, or `null` if this class does not declare a setter
   /// with the given name.
+  @Deprecated('Use getSetter2() instead')
   PropertyAccessorElement? getSetter(String name);
 
+  /// Return the element representing the setter with the given [name] that is
+  /// declared in this class, or `null` if this class does not declare a setter
+  /// with the given name.
+  SetterElement? getSetter2(String name);
+
   /// Return the element representing the constructor that results from looking
   /// up the constructor with the given [name] in this class with respect to the
   /// given [library], or `null` if the look up fails. The behavior of this
@@ -437,6 +452,7 @@ abstract class InterfaceType implements ParameterizedType {
   /// <i>T<i>. Otherwise, if <i>q</i> is not defined or not accessible, a
   /// NoSuchMethodException is thrown.
   /// </blockquote>
+  @Deprecated('Use lookUpConstructor2() instead')
   ConstructorElement? lookUpConstructor(String? name, LibraryElement library);
 
   /// Return the element representing the constructor that results from looking
@@ -449,7 +465,8 @@ abstract class InterfaceType implements ParameterizedType {
   /// <i>T<i>. Otherwise, if <i>q</i> is not defined or not accessible, a
   /// NoSuchMethodException is thrown.
   /// </blockquote>
-  ConstructorElement2? lookUpConstructor2(String? name, LibraryElement2 library);
+  ConstructorElement2? lookUpConstructor2(
+      String? name, LibraryElement2 library);
 
   /// Return the getter with the given [name].
   ///
@@ -461,6 +478,7 @@ abstract class InterfaceType implements ParameterizedType {
   ///
   /// If [recoveryStatic] is `true`, then static getters of the class,
   /// and its superclasses are considered. Clients should not use it.
+  @Deprecated('Use lookUpGetter3() instead')
   PropertyAccessorElement? lookUpGetter2(
     String name,
     LibraryElement library, {
@@ -497,6 +515,7 @@ abstract class InterfaceType implements ParameterizedType {
   ///
   /// If [recoveryStatic] is `true`, then static methods of the class,
   /// and its superclasses are considered. Clients should not use it.
+  @Deprecated('Use lookUpMethod3() instead')
   MethodElement? lookUpMethod2(
     String name,
     LibraryElement library, {
@@ -533,6 +552,7 @@ abstract class InterfaceType implements ParameterizedType {
   ///
   /// If [recoveryStatic] is `true`, then static setters of the class,
   /// and its superclasses are considered. Clients should not use it.
+  @Deprecated('Use lookUpSetter3() instead')
   PropertyAccessorElement? lookUpSetter2(
     String name,
     LibraryElement library, {
@@ -578,7 +598,7 @@ abstract class NeverType implements DartType {}
 ///
 /// This substitution will be propagated to its members. For example, say our
 /// `Foo<T>` class has a field `T bar;`. When we look up this field, we will get
-/// back a [FieldElement] that tracks the substituted type as `{S/T}T`, so when
+/// back a [FieldElement2] that tracks the substituted type as `{S/T}T`, so when
 /// we ask for the field type we will get `S`.
 ///
 /// Clients may not extend, implement or mix-in this class.
@@ -667,6 +687,7 @@ abstract class TypeParameterType implements DartType {
   /// Always consult the bound if that could be relevant.
   ElementLocation get definition;
 
+  @Deprecated('Use element3 instead')
   @override
   TypeParameterElement get element;