Element. Migrate src/dart/element/type.dart

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

Author: scheglov

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

@@ -550,7 +550,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
   final Map<String, DartObjectImpl>? _lexicalEnvironment;
 
   /// A mapping of type parameter names to runtime values (types).
-  final Map<TypeParameterElement, TypeImpl>? _lexicalTypeEnvironment;
+  final Map<TypeParameterElement2, TypeImpl>? _lexicalTypeEnvironment;
 
   final Substitution? _substitution;
 
@@ -573,7 +573,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
     this._library,
     this._errorReporter, {
     Map<String, DartObjectImpl>? lexicalEnvironment,
-    Map<TypeParameterElement, TypeImpl>? lexicalTypeEnvironment,
+    Map<TypeParameterElement2, TypeImpl>? lexicalTypeEnvironment,
     Substitution? substitution,
   })  : _lexicalEnvironment = lexicalEnvironment,
         _lexicalTypeEnvironment = lexicalTypeEnvironment,
@@ -888,7 +888,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
       if (typeArgumentTypes != null) {
         var instantiatedTypeArgumentTypes = typeArgumentTypes.map((type) {
           if (type is TypeParameterType) {
-            return _lexicalTypeEnvironment?[type.element] ?? type;
+            return _lexicalTypeEnvironment?[type.element3] ?? type;
           } else {
             return type;
           }
@@ -1924,7 +1924,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
       // Constants may refer to type parameters only if the constructor-tearoffs
       // feature is enabled.
       if (_library.featureSet.isEnabled(Feature.constructor_tearoffs)) {
-        var typeArgument = _lexicalTypeEnvironment?[variableElement];
+        var typeArgument = _lexicalTypeEnvironment?[variableElement.asElement2];
         if (typeArgument != null) {
           return DartObjectImpl(
             typeSystem,
@@ -2634,7 +2634,7 @@ class _InstanceCreationEvaluator {
 
   final List<DartObjectImpl> _argumentValues;
 
-  final Map<TypeParameterElement, TypeImpl> _typeParameterMap = HashMap();
+  final Map<TypeParameterElement2, TypeImpl> _typeParameterMap = HashMap();
 
   final Map<String, DartObjectImpl> _parameterMap = HashMap();
 
@@ -3255,7 +3255,7 @@ class _InstanceCreationEvaluator {
       for (int i = 0; i < typeParameters.length; i++) {
         var typeParameter = typeParameters[i];
         var typeArgument = typeArguments[i];
-        _typeParameterMap[typeParameter] = typeArgument;
+        _typeParameterMap[typeParameter.asElement2] = typeArgument;
       }
     }
   }

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

@@ -11117,6 +11117,7 @@ class TypeAliasElementImpl extends _ExistingElementImpl
     if (aliasedType_ is! InterfaceTypeImpl) {
       return false;
     }
+    var typeParameters = element.typeParameters2;
     var aliasedClass = aliasedType_.element;
     var typeArguments = aliasedType_.typeArguments;
     var typeParameterCount = typeParameters.length;
@@ -11133,7 +11134,7 @@ class TypeAliasElementImpl extends _ExistingElementImpl
       }
       var typeArgument = typeArguments[i];
       if (typeArgument is TypeParameterType &&
-          typeParameters[i] != typeArgument.element) {
+          typeParameters[i] != typeArgument.element3) {
         return false;
       }
     }

pkg/analyzer/lib/src/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
-
 import 'package:_fe_analyzer_shared/src/types/shared_type.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
@@ -42,6 +40,7 @@ class DynamicTypeImpl extends TypeImpl
   /// Prevent the creation of instances of this class.
   DynamicTypeImpl._();
 
+  @Deprecated('Use element2 instead')
   @override
   DynamicElementImpl get element => DynamicElementImpl.instance;
 
@@ -195,6 +194,7 @@ class FunctionTypeImpl extends TypeImpl
     super.alias,
   });
 
+  @Deprecated('Use element2 instead')
   @override
   Null get element => null;
 
@@ -1193,6 +1193,7 @@ class InvalidTypeImpl extends TypeImpl
   /// Prevent the creation of instances of this class.
   InvalidTypeImpl._();
 
+  @Deprecated('Use element2 instead')
   @override
   Null get element => null;
 
@@ -1374,6 +1375,7 @@ class RecordTypeImpl extends TypeImpl implements RecordType, SharedRecordType {
     );
   }
 
+  @Deprecated('Use element2 instead')
   @override
   Null get element => null;
 
@@ -1533,6 +1535,7 @@ abstract class TypeImpl implements DartType, SharedType {
   /// Initialize a newly created type.
   const TypeImpl({this.alias});
 
+  @Deprecated('Use element3 instead')
   @override
   Element? get element => element3?.asElement;
 
@@ -1607,6 +1610,7 @@ abstract class TypeImpl implements DartType, SharedType {
   /// Append a textual representation of this type to the given [builder].
   void appendTo(ElementDisplayStringBuilder builder);
 
+  @Deprecated('Use asInstanceOf2() instead')
   @override
   InterfaceTypeImpl? asInstanceOf(InterfaceElement targetElement) => null;
 
@@ -1780,6 +1784,7 @@ class TypeParameterTypeImpl extends TypeImpl implements TypeParameterType {
     builder.writeTypeParameterType(this);
   }
 
+  @Deprecated('Use asInstanceOf2() instead')
   @override
   InterfaceTypeImpl? asInstanceOf(InterfaceElement targetElement) {
     return bound.asInstanceOf(targetElement);
@@ -1820,6 +1825,7 @@ class VoidTypeImpl extends TypeImpl implements VoidType, SharedVoidType {
   /// Prevent the creation of instances of this class.
   VoidTypeImpl._();
 
+  @Deprecated('Use element2 instead')
   @override
   Null get element => null;
 

pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart

@@ -1701,11 +1701,11 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
       return;
     }
 
-    var element = type.element;
+    var element = type.element3;
     switch (element) {
-      case ClassElement():
+      case ClassElement2():
         return;
-      case MixinElement():
+      case MixinElement2():
         if (clause is ImplementsClause ||
             clause is MixinOnClause ||
             clause is WithClause) {