Elements. Migrate TypeProviderImpl.

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

Author: scheglov

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

@@ -2671,7 +2671,7 @@ class _InstanceCreationEvaluator {
 
   /// Evaluates this constructor call as a factory constructor call.
   Constant evaluateFactoryConstructorCall(List<Expression> arguments) {
-    var definingClass = _constructor.enclosingElement3;
+    var definingClass = _constructor.asElement2.enclosingElement2;
     var argumentCount = arguments.length;
     if (_constructor.name == "fromEnvironment") {
       if (!_checkFromEnvironmentArguments(arguments, definingType)) {
@@ -2682,7 +2682,7 @@ class _InstanceCreationEvaluator {
       }
       String? variableName =
           argumentCount < 1 ? null : firstArgument?.toStringValue();
-      if (definingClass == typeProvider.boolElement) {
+      if (definingClass == typeProvider.boolElement2) {
         // Special case: https://github.com/dart-lang/sdk/issues/50045
         if (variableName == 'dart.library.js_util') {
           return DartObjectImpl(
@@ -2693,20 +2693,20 @@ class _InstanceCreationEvaluator {
         }
         return FromEnvironmentEvaluator(typeSystem, _declaredVariables)
             .getBool2(variableName, _namedValues, _constructor.asElement2);
-      } else if (definingClass == typeProvider.intElement) {
+      } else if (definingClass == typeProvider.intElement2) {
         return FromEnvironmentEvaluator(typeSystem, _declaredVariables)
             .getInt2(variableName, _namedValues, _constructor.asElement2);
-      } else if (definingClass == typeProvider.stringElement) {
+      } else if (definingClass == typeProvider.stringElement2) {
         return FromEnvironmentEvaluator(typeSystem, _declaredVariables)
             .getString2(variableName, _namedValues, _constructor.asElement2);
       }
     } else if (_constructor.name == 'hasEnvironment' &&
-        definingClass == typeProvider.boolElement) {
+        definingClass == typeProvider.boolElement2) {
       var name = argumentCount < 1 ? null : firstArgument?.toStringValue();
       return FromEnvironmentEvaluator(typeSystem, _declaredVariables)
           .hasEnvironment(name);
     } else if (_constructor.name == "" &&
-        definingClass == typeProvider.symbolElement &&
+        definingClass == typeProvider.symbolElement2 &&
         argumentCount == 1) {
       if (!_checkSymbolArguments(arguments)) {
         return InvalidConstant.forEntity(

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

@@ -76,22 +76,22 @@ class NormalizeHelper {
 
     // * if S is Never then Future<Never>
     if (identical(S, NeverTypeImpl.instance)) {
-      return typeProvider.futureElement.instantiateImpl(
+      return typeProvider.futureElement2.instantiateImpl(
         typeArguments: [NeverTypeImpl.instance],
         nullabilitySuffix: NullabilitySuffix.none,
       );
     }
 
     // * if S is Null then Future<Null>?
     if (S_nullability == NullabilitySuffix.none && S.isDartCoreNull) {
-      return typeProvider.futureElement.instantiateImpl(
+      return typeProvider.futureElement2.instantiateImpl(
         typeArguments: [typeSystem.nullNone],
         nullabilitySuffix: NullabilitySuffix.question,
       );
     }
 
     // * else FutureOr<S>
-    return typeProvider.futureOrElement.instantiateImpl(
+    return typeProvider.futureOrElement2.instantiateImpl(
       typeArguments: [S],
       nullabilitySuffix: NullabilitySuffix.none,
     );

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

@@ -151,7 +151,7 @@ class SubtypeHelper {
       var S0 = T0.typeArguments[0];
       // * `T0 <: T1` iff `Future<S0> <: T1` and `S0 <: T1`
       if (isSubtypeOf(S0, T1)) {
-        var FutureS0 = _typeProvider.futureElement.instantiateImpl(
+        var FutureS0 = _typeProvider.futureElement2.instantiateImpl(
           typeArguments: fixedTypeList(S0),
           nullabilitySuffix: NullabilitySuffix.none,
         );
@@ -197,7 +197,7 @@ class SubtypeHelper {
       var S1 = T1.typeArguments[0];
       // `T0 <: T1` iff any of the following hold:
       // * either `T0 <: Future<S1>`
-      var FutureS1 = _typeProvider.futureElement.instantiateImpl(
+      var FutureS1 = _typeProvider.futureElement2.instantiateImpl(
         typeArguments: fixedTypeList(S1),
         nullabilitySuffix: NullabilitySuffix.none,
       );

pkg/analyzer/lib/src/dart/element/type_provider.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/dart/element/nullability_suffix.dart';
@@ -163,6 +161,7 @@ class TypeProviderImpl extends TypeProviderBase {
   })  : _coreLibrary = coreLibrary,
         _asyncLibrary = asyncLibrary;
 
+  @Deprecated('Use boolElement2 instead')
   @override
   ClassElementImpl get boolElement {
     return boolElement2.asElement;
@@ -198,6 +197,7 @@ class TypeProviderImpl extends TypeProviderBase {
     );
   }
 
+  @Deprecated('Use doubleElement2 instead')
   @override
   ClassElementImpl get doubleElement {
     return doubleElement2.asElement;
@@ -222,6 +222,7 @@ class TypeProviderImpl extends TypeProviderBase {
   @override
   TypeImpl get dynamicType => DynamicTypeImpl.instance;
 
+  @Deprecated('Use enumElement2 instead')
   @override
   ClassElementImpl? get enumElement {
     return enumElement2?.asElement;
@@ -271,6 +272,7 @@ class TypeProviderImpl extends TypeProviderBase {
     );
   }
 
+  @Deprecated('Use futureElement2 instead')
   @override
   ClassElementImpl get futureElement {
     return futureElement2.asElement;
@@ -289,6 +291,7 @@ class TypeProviderImpl extends TypeProviderBase {
     );
   }
 
+  @Deprecated('Use futureOrElement2 instead')
   @override
   ClassElementImpl get futureOrElement {
     return futureOrElement2.asElement;
@@ -307,6 +310,7 @@ class TypeProviderImpl extends TypeProviderBase {
     );
   }
 
+  @Deprecated('Use intElement2 instead')
   @override
   ClassElementImpl get intElement {
     return intElement2.asElement;
@@ -336,6 +340,7 @@ class TypeProviderImpl extends TypeProviderBase {
     );
   }
 
+  @Deprecated('Use iterableElement2 instead')
   @override
   ClassElementImpl get iterableElement {
     return iterableElement2.asElement;
@@ -354,6 +359,7 @@ class TypeProviderImpl extends TypeProviderBase {
     );
   }
 
+  @Deprecated('Use listElement2 instead')
   @override
   ClassElementImpl get listElement {
     return listElement2.asElement;
@@ -364,6 +370,7 @@ class TypeProviderImpl extends TypeProviderBase {
     return _listElement ??= _getClassElement(_coreLibrary, 'List');
   }
 
+  @Deprecated('Use mapElement2 instead')
   @override
   ClassElementImpl get mapElement {
     return mapElement2.asElement;
@@ -385,6 +392,7 @@ class TypeProviderImpl extends TypeProviderBase {
   @override
   NeverTypeImpl get neverType => NeverTypeImpl.instance;
 
+  @Deprecated('Use nullElement2 instead')
   @override
   ClassElementImpl get nullElement {
     return nullElement2.asElement;
@@ -403,6 +411,7 @@ class TypeProviderImpl extends TypeProviderBase {
     );
   }
 
+  @Deprecated('Use numElement2 instead')
   @override
   ClassElementImpl get numElement {
     return numElement2.asElement;
@@ -424,6 +433,7 @@ class TypeProviderImpl extends TypeProviderBase {
   InterfaceTypeImpl get numTypeQuestion =>
       _numTypeQuestion ??= numType.withNullability(NullabilitySuffix.question);
 
+  @Deprecated('Use objectElement2 instead')
   @override
   ClassElementImpl get objectElement {
     return objectElement2.asElement;
@@ -436,20 +446,21 @@ class TypeProviderImpl extends TypeProviderBase {
 
   @override
   InterfaceTypeImpl get objectQuestionType {
-    return _objectQuestionType ??= objectElement.instantiateImpl(
+    return _objectQuestionType ??= objectElement2.instantiateImpl(
       typeArguments: const [],
       nullabilitySuffix: NullabilitySuffix.question,
     );
   }
 
   @override
   InterfaceTypeImpl get objectType {
-    return _objectType ??= objectElement.instantiateImpl(
+    return _objectType ??= objectElement2.instantiateImpl(
       typeArguments: const [],
       nullabilitySuffix: NullabilitySuffix.none,
     );
   }
 
+  @Deprecated('Use recordElement2 instead')
   @override
   ClassElementImpl get recordElement {
     return recordElement2.asElement;
@@ -462,12 +473,13 @@ class TypeProviderImpl extends TypeProviderBase {
 
   @override
   InterfaceTypeImpl get recordType {
-    return _recordType ??= recordElement.instantiateImpl(
+    return _recordType ??= recordElement2.instantiateImpl(
       typeArguments: const [],
       nullabilitySuffix: NullabilitySuffix.none,
     );
   }
 
+  @Deprecated('Use setElement2 instead')
   @override
   ClassElementImpl get setElement {
     return setElement2.asElement;
@@ -498,6 +510,7 @@ class TypeProviderImpl extends TypeProviderBase {
     );
   }
 
+  @Deprecated('Use streamElement2 instead')
   @override
   ClassElementImpl get streamElement {
     return streamElement2.asElement;
@@ -508,6 +521,7 @@ class TypeProviderImpl extends TypeProviderBase {
     return _streamElement ??= _getClassElement(_asyncLibrary, 'Stream');
   }
 
+  @Deprecated('Use stringElement2 instead')
   @override
   ClassElementImpl get stringElement {
     return stringElement2.asElement;
@@ -526,6 +540,7 @@ class TypeProviderImpl extends TypeProviderBase {
     );
   }
 
+  @Deprecated('Use symbolElement2 instead')
   @override
   ClassElementImpl get symbolElement {
     return symbolElement2.asElement;
@@ -561,20 +576,21 @@ class TypeProviderImpl extends TypeProviderBase {
 
   @override
   InterfaceTypeImpl futureOrType(covariant TypeImpl valueType) {
-    return futureOrElement.instantiateImpl(
+    return futureOrElement2.instantiateImpl(
       typeArguments: fixedTypeList(valueType),
       nullabilitySuffix: NullabilitySuffix.none,
     );
   }
 
   @override
   InterfaceTypeImpl futureType(covariant TypeImpl valueType) {
-    return futureElement.instantiateImpl(
+    return futureElement2.instantiateImpl(
       typeArguments: fixedTypeList(valueType),
       nullabilitySuffix: NullabilitySuffix.none,
     );
   }
 
+  @Deprecated('Use isNonSubtypableClass2() instead')
   @override
   bool isNonSubtypableClass(InterfaceElement element) {
     return isNonSubtypableClass2(element.asElement2);
@@ -593,15 +609,15 @@ class TypeProviderImpl extends TypeProviderBase {
 
   @override
   InterfaceTypeImpl iterableType(covariant TypeImpl elementType) {
-    return iterableElement.instantiateImpl(
+    return iterableElement2.instantiateImpl(
       typeArguments: fixedTypeList(elementType),
       nullabilitySuffix: NullabilitySuffix.none,
     );
   }
 
   @override
   InterfaceTypeImpl listType(covariant TypeImpl elementType) {
-    return listElement.instantiateImpl(
+    return listElement2.instantiateImpl(
       typeArguments: fixedTypeList(elementType),
       nullabilitySuffix: NullabilitySuffix.none,
     );
@@ -612,23 +628,23 @@ class TypeProviderImpl extends TypeProviderBase {
     covariant TypeImpl keyType,
     covariant TypeImpl valueType,
   ) {
-    return mapElement.instantiateImpl(
+    return mapElement2.instantiateImpl(
       typeArguments: fixedTypeList(keyType, valueType),
       nullabilitySuffix: NullabilitySuffix.none,
     );
   }
 
   @override
   InterfaceTypeImpl setType(covariant TypeImpl elementType) {
-    return setElement.instantiateImpl(
+    return setElement2.instantiateImpl(
       typeArguments: fixedTypeList(elementType),
       nullabilitySuffix: NullabilitySuffix.none,
     );
   }
 
   @override
   InterfaceTypeImpl streamType(covariant TypeImpl elementType) {
-    return streamElement.instantiateImpl(
+    return streamElement2.instantiateImpl(
       typeArguments: fixedTypeList(elementType),
       nullabilitySuffix: NullabilitySuffix.none,
     );

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

@@ -447,7 +447,7 @@ class TypeSystemImpl implements TypeSystem {
   TypeImpl? futureType(TypeImpl T) {
     // T implements S, and there is a U such that S is Future<U>
     if (T.nullabilitySuffix != NullabilitySuffix.question) {
-      var result = T.asInstanceOf(typeProvider.futureElement);
+      var result = T.asInstanceOf2(typeProvider.futureElement2);
       if (result != null) {
         return result;
       }

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

@@ -714,23 +714,23 @@ class TypeSystemOperations
 
   @override
   TypeImpl? matchIterableTypeInternal(TypeImpl type) {
-    var iterableElement = typeSystem.typeProvider.iterableElement;
-    var listType = type.asInstanceOf(iterableElement);
+    var iterableElement = typeSystem.typeProvider.iterableElement2;
+    var listType = type.asInstanceOf2(iterableElement);
     return listType?.typeArguments[0];
   }
 
   @override
   SharedTypeView? matchListType(SharedTypeView type) {
-    var listElement = typeSystem.typeProvider.listElement;
-    var listType = type.unwrapTypeView<TypeImpl>().asInstanceOf(listElement);
+    var listElement = typeSystem.typeProvider.listElement2;
+    var listType = type.unwrapTypeView<TypeImpl>().asInstanceOf2(listElement);
     return listType == null ? null : SharedTypeView(listType.typeArguments[0]);
   }
 
   @override
   ({SharedTypeView keyType, SharedTypeView valueType})? matchMapType(
       SharedTypeView type) {
-    var mapElement = typeSystem.typeProvider.mapElement;
-    var mapType = type.unwrapTypeView<TypeImpl>().asInstanceOf(mapElement);
+    var mapElement = typeSystem.typeProvider.mapElement2;
+    var mapType = type.unwrapTypeView<TypeImpl>().asInstanceOf2(mapElement);
     if (mapType != null) {
       return (
         keyType: SharedTypeView(mapType.typeArguments[0]),
@@ -742,8 +742,8 @@ class TypeSystemOperations
 
   @override
   SharedTypeView? matchStreamType(SharedTypeView type) {
-    var streamElement = typeSystem.typeProvider.streamElement;
-    var listType = type.unwrapTypeView<TypeImpl>().asInstanceOf(streamElement);
+    var streamElement = typeSystem.typeProvider.streamElement2;
+    var listType = type.unwrapTypeView<TypeImpl>().asInstanceOf2(streamElement);
     return listType == null ? null : SharedTypeView(listType.typeArguments[0]);
   }