Elements. Use InterfaceElementImpl2 to create InterfaceTypeImpl.

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

Author: scheglov

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

@@ -6628,7 +6628,7 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
       }
     }
 
-    var result = InterfaceTypeImpl.v2(
+    var result = InterfaceTypeImpl(
       element: this,
       typeArguments: typeArguments,
       nullabilitySuffix: nullabilitySuffix,
@@ -7342,7 +7342,7 @@ class LibraryElementImpl extends ElementImpl
   }
 
   @override
-  ClassElement2? getClass2(String name) {
+  ClassElementImpl2? getClass2(String name) {
     return _getElementByName(classes, name);
   }
 
@@ -11012,9 +11012,9 @@ class TypeAliasElementImpl extends _ExistingElementImpl
           typeArguments: typeArguments,
         ),
       );
-    } else if (type is InterfaceType) {
+    } else if (type is InterfaceTypeImpl) {
       return InterfaceTypeImpl(
-        element: type.element,
+        element: type.element3,
         typeArguments: type.typeArguments,
         nullabilitySuffix: resultNullability,
         alias: InstantiatedTypeAliasElementImpl(

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

@@ -91,7 +91,7 @@ class InterfaceLeastUpperBoundHelper {
         }
       }
 
-      return InterfaceTypeImpl.v2(
+      return InterfaceTypeImpl(
         element: type1.element3,
         typeArguments: args,
         nullabilitySuffix: nullability,

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

@@ -111,7 +111,7 @@ class ReplaceTopBottomVisitor {
       newTypeArguments.add(newTypeArgument);
     }
 
-    return InterfaceTypeImpl.v2(
+    return InterfaceTypeImpl(
       element: type.element3,
       nullabilitySuffix: type.nullabilitySuffix,
       typeArguments: newTypeArguments,

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

@@ -76,7 +76,7 @@ class ReplacementVisitor
   }
 
   DartType? createInterfaceType({
-    required InterfaceType type,
+    required InterfaceTypeImpl type,
     required InstantiatedTypeAliasElement? newAlias,
     required List<DartType>? newTypeArguments,
     required NullabilitySuffix? newNullability,
@@ -88,7 +88,7 @@ class ReplacementVisitor
     }
 
     return InterfaceTypeImpl(
-      element: type.element,
+      element: type.element3,
       typeArguments: newTypeArguments ?? type.typeArguments,
       nullabilitySuffix: newNullability ?? type.nullabilitySuffix,
       alias: newAlias ?? type.alias,
@@ -356,7 +356,7 @@ class ReplacementVisitor
   }
 
   @override
-  DartType? visitInterfaceType(InterfaceType type) {
+  DartType? visitInterfaceType(covariant InterfaceTypeImpl type) {
     var newNullability = visitNullability(type);
 
     InstantiatedTypeAliasElement? newAlias;

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

@@ -590,22 +590,6 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
   List<MethodElement>? _methods;
 
   factory InterfaceTypeImpl({
-    required InterfaceElement element,
-    required List<DartType> typeArguments,
-    required NullabilitySuffix nullabilitySuffix,
-    InstantiatedTypeAliasElement? alias,
-  }) {
-    // TODO(paulberry): avoid this cast by changing the type of `element`
-    element as InterfaceElementImpl;
-    return InterfaceTypeImpl.v2(
-      element: element.asElement2,
-      typeArguments: typeArguments,
-      nullabilitySuffix: nullabilitySuffix,
-      alias: alias,
-    );
-  }
-
-  factory InterfaceTypeImpl.v2({
     required InterfaceElementImpl2 element,
     required List<DartType> typeArguments,
     required NullabilitySuffix nullabilitySuffix,
@@ -1178,7 +1162,7 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
     if (this.nullabilitySuffix == nullabilitySuffix) return this;
 
     return InterfaceTypeImpl(
-      element: element,
+      element: element3,
       typeArguments: typeArguments,
       nullabilitySuffix: nullabilitySuffix,
       alias: alias,

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

@@ -566,7 +566,7 @@ abstract class _TypeSubstitutor
   }
 
   @override
-  DartType visitInterfaceType(InterfaceType type) {
+  DartType visitInterfaceType(covariant InterfaceTypeImpl type) {
     if (type.typeArguments.isEmpty && type.alias == null) {
       return type;
     }
@@ -579,7 +579,7 @@ abstract class _TypeSubstitutor
     }
 
     return InterfaceTypeImpl(
-      element: type.element,
+      element: type.element3,
       typeArguments: typeArguments,
       nullabilitySuffix: type.nullabilitySuffix,
       alias: alias,