Elements. Migrate to TypeSystemImpl.instantiateInterfaceToBounds2()

Change-Id: Ifde7a24b66d1ed27dc8cdaa99d241d39ca823f74
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/406740
Reviewed-by: Keerti Parthasarathy <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

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

@@ -754,7 +754,17 @@ class TypeSystemImpl implements TypeSystem {
     required covariant InterfaceElementImpl element,
     required NullabilitySuffix nullabilitySuffix,
   }) {
-    var typeParameters = element.typeParameters;
+    return instantiateInterfaceToBounds2(
+      element: element.asElement2,
+      nullabilitySuffix: nullabilitySuffix,
+    );
+  }
+
+  InterfaceTypeImpl instantiateInterfaceToBounds2({
+    required covariant InterfaceElementImpl2 element,
+    required NullabilitySuffix nullabilitySuffix,
+  }) {
+    var typeParameters = element.typeParameters2;
     var typeArguments = _defaultTypeArguments(typeParameters);
     return element.instantiate(
       typeArguments: typeArguments,
@@ -800,7 +810,17 @@ class TypeSystemImpl implements TypeSystem {
     required covariant TypeAliasElementImpl element,
     required NullabilitySuffix nullabilitySuffix,
   }) {
-    var typeParameters = element.typeParameters;
+    return instantiateTypeAliasToBounds2(
+      element: element.asElement2,
+      nullabilitySuffix: nullabilitySuffix,
+    );
+  }
+
+  TypeImpl instantiateTypeAliasToBounds2({
+    required covariant TypeAliasElementImpl2 element,
+    required NullabilitySuffix nullabilitySuffix,
+  }) {
+    var typeParameters = element.typeParameters2;
     var typeArguments = _defaultTypeArguments(typeParameters);
     return element.instantiate(
       typeArguments: typeArguments,
@@ -2050,10 +2070,10 @@ class TypeSystemImpl implements TypeSystem {
   }
 
   List<DartType> _defaultTypeArguments(
-    List<TypeParameterElement> typeParameters,
+    List<TypeParameterElement2> typeParameters,
   ) {
     return typeParameters.map((typeParameter) {
-      var typeParameterImpl = typeParameter as TypeParameterElementImpl;
+      var typeParameterImpl = typeParameter as TypeParameterElementImpl2;
       return typeParameterImpl.defaultType!;
     }).toFixedList();
   }

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

@@ -263,8 +263,8 @@ class NamedTypeResolver with ScopeHelpers {
             dataForTesting: dataForTesting, nodeForTesting: node);
       }
 
-      return typeSystem.instantiateInterfaceToBounds(
-        element: element,
+      return typeSystem.instantiateInterfaceToBounds2(
+        element: element.asElement2,
         nullabilitySuffix: nullability,
       );
     } else if (element is TypeAliasElementImpl) {

pkg/analyzer/lib/src/summary2/library_builder.dart

@@ -40,6 +40,7 @@ import 'package:analyzer/src/summary2/reference_resolver.dart';
 import 'package:analyzer/src/summary2/types_builder.dart';
 import 'package:analyzer/src/util/performance/operation_performance.dart';
 import 'package:analyzer/src/utilities/extensions/collection.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:analyzer/src/utilities/extensions/object.dart';
 import 'package:collection/collection.dart';
 import 'package:macros/src/executor.dart' as macro;
@@ -222,8 +223,8 @@ class LibraryBuilder with MacroApplicationsContainer {
       enum_.element.supertype =
           typeProvider.enumType ?? typeProvider.objectType;
       var valuesType = typeProvider.listType(
-        element.typeSystem.instantiateInterfaceToBounds(
-          element: enum_.element,
+        element.typeSystem.instantiateInterfaceToBounds2(
+          element: enum_.element.asElement2,
           nullabilitySuffix: typeProvider.objectType.nullabilitySuffix,
         ),
       );

pkg/analyzer/lib/src/summary2/macro_declarations.dart

@@ -557,8 +557,8 @@ class DeclarationBuilder {
         return DynamicTypeImpl.instance;
       case InterfaceElementImpl():
         if (typeCode.typeArguments.isEmpty) {
-          return _typeSystem.instantiateInterfaceToBounds(
-            element: element,
+          return _typeSystem.instantiateInterfaceToBounds2(
+            element: element.asElement2,
             nullabilitySuffix: NullabilitySuffix.none,
           );
         }

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

@@ -586,6 +586,12 @@ extension TypeAliasElementExtension on TypeAliasElement {
   }
 }
 
+extension TypeAliasElementImplExtension on TypeAliasElementImpl {
+  TypeAliasElementImpl2 get asElement2 {
+    return element;
+  }
+}
+
 extension TypeParameterElement2Extension on TypeParameterElement2 {
   TypeParameterElement get asElement {
     return firstFragment as TypeParameterElement;