Deprecate type_provider's getters ending in 2, and rename TypeProviderImpl.functionElement2 to functionElement.

Change-Id: Iac9659aaed0dcd92e4cf13f9859dea2bf7b47f47
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/437582
Reviewed-by: Samuel Rawlins <[email protected]>
Reviewed-by: Paul Berry <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>

Author: fshcheglov

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

@@ -429,7 +429,7 @@ class AddDiagnosticPropertyReference extends ResolvedCorrectionProducer {
   }
 
   bool _isIterable(DartType type) {
-    return type.asInstanceOf2(typeProvider.iterableElement2) != null;
+    return type.asInstanceOf2(typeProvider.iterableElement) != null;
   }
 
   ({int offset, String prefix}) _offsetAndPrefixOfBlock(Block block) {

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

@@ -130,15 +130,15 @@ class AddNullCheck extends ResolvedCorrectionProducer {
       var literal = parent.thisOrAncestorOfType<TypedLiteral>();
       if (literal is ListLiteral) {
         toType = literal.typeOrThrow.asInstanceOf2(
-          typeProvider.iterableElement2,
+          typeProvider.iterableElement,
         );
       } else if (literal is SetOrMapLiteral) {
         toType =
             literal.typeOrThrow.isDartCoreSet
                 ? literal.typeOrThrow.asInstanceOf2(
-                  typeProvider.iterableElement2,
+                  typeProvider.iterableElement,
                 )
-                : literal.typeOrThrow.asInstanceOf2(typeProvider.mapElement2);
+                : literal.typeOrThrow.asInstanceOf2(typeProvider.mapElement);
       }
     } else if (parent is YieldStatement) {
       var enclosingExecutable =

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

@@ -99,18 +99,18 @@ class AddReturnType extends ResolvedCorrectionProducer {
 
     if (body.isAsynchronous) {
       if (body.isGenerator) {
-        return typeProvider.streamElement2.instantiate(
+        return typeProvider.streamElement.instantiate(
           typeArguments: [baseType],
           nullabilitySuffix: baseType.nullabilitySuffix,
         );
       } else {
-        return typeProvider.futureElement2.instantiate(
+        return typeProvider.futureElement.instantiate(
           typeArguments: [baseType],
           nullabilitySuffix: baseType.nullabilitySuffix,
         );
       }
     } else if (body.isGenerator) {
-      return typeProvider.iterableElement2.instantiate(
+      return typeProvider.iterableElement.instantiate(
         typeArguments: [baseType],
         nullabilitySuffix: baseType.nullabilitySuffix,
       );

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

@@ -60,7 +60,7 @@ class ConvertIntoForIndex extends ResolvedCorrectionProducer {
     {
       var iterableType = iterable.staticType;
       if (iterableType is! InterfaceType ||
-          iterableType.element != typeProvider.listElement2) {
+          iterableType.element != typeProvider.listElement) {
         return;
       }
     }

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

@@ -42,7 +42,7 @@ class ConvertMapFromIterableToForLiteral extends ResolvedCorrectionProducer {
     var element = creation.constructorName.element;
     if (element == null ||
         element.name3 != 'fromIterable' ||
-        element.enclosingElement != typeProvider.mapElement2) {
+        element.enclosingElement != typeProvider.mapElement) {
       return;
     }
     //

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

@@ -84,7 +84,7 @@ class ConvertToMapLiteral extends ResolvedCorrectionProducer {
   /// Return `true` if the [element] represents either the class `Map` or
   /// `LinkedHashMap`.
   bool _isMapClass(InterfaceElement element) =>
-      element == typeProvider.mapElement2 ||
+      element == typeProvider.mapElement ||
       (element.name3 == 'LinkedHashMap' &&
           element.library.name3 == 'dart.collection');
 }

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

@@ -147,7 +147,7 @@ class ConvertToSetLiteral extends ResolvedCorrectionProducer {
     }
 
     // TODO(brianwilkerson): Consider also accepting uses of LinkedHashSet.
-    if (type.element != typeProvider.setElement2) {
+    if (type.element != typeProvider.setElement) {
       return null;
     }
     return creation;
@@ -199,14 +199,14 @@ class ConvertToSetLiteral extends ResolvedCorrectionProducer {
       var parent2 = parent.parent;
       if (parent2 is VariableDeclarationList) {
         var type = parent2.type?.type;
-        if (type is InterfaceType && type.element == typeProvider.setElement2) {
+        if (type is InterfaceType && type.element == typeProvider.setElement) {
           return true;
         }
       }
     } else if (parent.parent is InvocationExpression) {
       var parameterElement = creation.correspondingParameter;
       var type = parameterElement?.type;
-      if (type is InterfaceType && type.element == typeProvider.setElement2) {
+      if (type is InterfaceType && type.element == typeProvider.setElement) {
         return true;
       }
     }

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

@@ -161,7 +161,7 @@ class ReplaceWithVar extends ResolvedCorrectionProducer {
         }
         var iterableType = parent.iterable.typeOrThrow;
         var instantiatedType = iterableType.asInstanceOf2(
-          typeProvider.iterableElement2,
+          typeProvider.iterableElement,
         );
         if (instantiatedType?.typeArguments.first == staticType) {
           return true;

pkg/analysis_server/lib/src/services/refactoring/legacy/extract_method.dart

@@ -1034,7 +1034,7 @@ final class ExtractMethodRefactoringImpl extends RefactoringImpl
       _variableType = _getTypeCode(returnTypeObj);
       if (_hasAwait) {
         if (returnTypeObj is InterfaceType &&
-            returnTypeObj.element != typeProvider.futureElement2) {
+            returnTypeObj.element != typeProvider.futureElement) {
           returnType = _getTypeCode(typeProvider.futureType(returnTypeObj));
         }
       } else {

pkg/analysis_server/tool/code_completion/relevance_metrics.dart

@@ -2072,11 +2072,11 @@ class RelevanceDataCollector extends RecursiveAstVisitor<void> {
           argumentType is InterfaceType &&
           parameterType is InterfaceType) {
         int distance;
-        if (parameterType.element == typeProvider.futureOrElement2) {
+        if (parameterType.element == typeProvider.futureOrElement) {
           var typeArgument = parameterType.typeArguments[0];
           distance = featureComputer.inheritanceDistance(
             argumentType.element,
-            typeProvider.futureElement2,
+            typeProvider.futureElement,
           );
           if (typeArgument is InterfaceType) {
             var argDistance = featureComputer.inheritanceDistance(