Elements. Migrate InstantiatedTypeAliasElementImpl.

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

Author: scheglov

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

@@ -11202,68 +11202,10 @@ class TypeAliasElementImpl extends _ExistingElementImpl
     required List<DartType> typeArguments,
     required NullabilitySuffix nullabilitySuffix,
   }) {
-    if (hasSelfReference) {
-      if (isNonFunctionTypeAliasesEnabled) {
-        return DynamicTypeImpl.instance;
-      } else {
-        return _errorFunctionType(nullabilitySuffix);
-      }
-    }
-
-    var substitution = Substitution.fromPairs(typeParameters, typeArguments);
-    var type = substitution.substituteType(aliasedType);
-
-    var resultNullability = type.nullabilitySuffix == NullabilitySuffix.question
-        ? NullabilitySuffix.question
-        : nullabilitySuffix;
-
-    if (type is FunctionTypeImpl) {
-      return FunctionTypeImpl(
-        typeFormals: type.typeFormals,
-        parameters: type.parameters,
-        returnType: type.returnType,
-        nullabilitySuffix: resultNullability,
-        alias: InstantiatedTypeAliasElementImpl(
-          element: this,
-          // TODO(scheglov): remove this cast
-          typeArguments: typeArguments.cast(),
-        ),
-      );
-    } else if (type is InterfaceTypeImpl) {
-      return InterfaceTypeImpl(
-        element: type.element3,
-        typeArguments: type.typeArguments,
-        nullabilitySuffix: resultNullability,
-        alias: InstantiatedTypeAliasElementImpl(
-          element: this,
-          // TODO(scheglov): remove this cast
-          typeArguments: typeArguments.cast(),
-        ),
-      );
-    } else if (type is RecordTypeImpl) {
-      return RecordTypeImpl(
-        positionalFields: type.positionalFields,
-        namedFields: type.namedFields,
-        nullabilitySuffix: resultNullability,
-        alias: InstantiatedTypeAliasElementImpl(
-          element: this,
-          // TODO(scheglov): remove this cast
-          typeArguments: typeArguments.cast(),
-        ),
-      );
-    } else if (type is TypeParameterTypeImpl) {
-      return TypeParameterTypeImpl(
-        element: type.element,
-        nullabilitySuffix: resultNullability,
-        alias: InstantiatedTypeAliasElementImpl(
-          element: this,
-          // TODO(scheglov): remove this cast
-          typeArguments: typeArguments.cast(),
-        ),
-      );
-    } else {
-      return type.withNullability(resultNullability);
-    }
+    return element.instantiate(
+      typeArguments: typeArguments,
+      nullabilitySuffix: nullabilitySuffix,
+    );
   }
 
   void setLinkedData(Reference reference, ElementLinkedData linkedData) {
@@ -11272,15 +11214,6 @@ class TypeAliasElementImpl extends _ExistingElementImpl
 
     this.linkedData = linkedData;
   }
-
-  FunctionTypeImpl _errorFunctionType(NullabilitySuffix nullabilitySuffix) {
-    return FunctionTypeImpl(
-      typeFormals: const [],
-      parameters: const [],
-      returnType: DynamicTypeImpl.instance,
-      nullabilitySuffix: nullabilitySuffix,
-    );
-  }
 }
 
 class TypeAliasElementImpl2 extends TypeDefiningElementImpl2
@@ -11370,11 +11303,88 @@ class TypeAliasElementImpl2 extends TypeDefiningElementImpl2
   }
 
   @override
-  TypeImpl instantiate(
-          {required List<DartType> typeArguments,
-          required NullabilitySuffix nullabilitySuffix}) =>
-      firstFragment.instantiate(
-          typeArguments: typeArguments, nullabilitySuffix: nullabilitySuffix);
+  TypeImpl instantiate({
+    required List<DartType> typeArguments,
+    required NullabilitySuffix nullabilitySuffix,
+  }) {
+    return instantiateImpl(
+      typeArguments: typeArguments.cast<TypeImpl>(),
+      nullabilitySuffix: nullabilitySuffix,
+    );
+  }
+
+  TypeImpl instantiateImpl({
+    required List<TypeImpl> typeArguments,
+    required NullabilitySuffix nullabilitySuffix,
+  }) {
+    if (firstFragment.hasSelfReference) {
+      if (firstFragment.isNonFunctionTypeAliasesEnabled) {
+        return DynamicTypeImpl.instance;
+      } else {
+        return _errorFunctionType(nullabilitySuffix);
+      }
+    }
+
+    var substitution = Substitution.fromPairs2(typeParameters2, typeArguments);
+    var type = substitution.substituteType(aliasedType);
+
+    var resultNullability = type.nullabilitySuffix == NullabilitySuffix.question
+        ? NullabilitySuffix.question
+        : nullabilitySuffix;
+
+    if (type is FunctionTypeImpl) {
+      return FunctionTypeImpl(
+        typeFormals: type.typeFormals,
+        parameters: type.parameters,
+        returnType: type.returnType,
+        nullabilitySuffix: resultNullability,
+        alias: InstantiatedTypeAliasElementImpl(
+          element2: this,
+          typeArguments: typeArguments,
+        ),
+      );
+    } else if (type is InterfaceTypeImpl) {
+      return InterfaceTypeImpl(
+        element: type.element3,
+        typeArguments: type.typeArguments,
+        nullabilitySuffix: resultNullability,
+        alias: InstantiatedTypeAliasElementImpl(
+          element2: this,
+          typeArguments: typeArguments,
+        ),
+      );
+    } else if (type is RecordTypeImpl) {
+      return RecordTypeImpl(
+        positionalFields: type.positionalFields,
+        namedFields: type.namedFields,
+        nullabilitySuffix: resultNullability,
+        alias: InstantiatedTypeAliasElementImpl(
+          element2: this,
+          typeArguments: typeArguments,
+        ),
+      );
+    } else if (type is TypeParameterTypeImpl) {
+      return TypeParameterTypeImpl(
+        element: type.element,
+        nullabilitySuffix: resultNullability,
+        alias: InstantiatedTypeAliasElementImpl(
+          element2: this,
+          typeArguments: typeArguments,
+        ),
+      );
+    } else {
+      return type.withNullability(resultNullability);
+    }
+  }
+
+  FunctionTypeImpl _errorFunctionType(NullabilitySuffix nullabilitySuffix) {
+    return FunctionTypeImpl(
+      typeFormals: const [],
+      parameters: const [],
+      returnType: DynamicTypeImpl.instance,
+      nullabilitySuffix: nullabilitySuffix,
+    );
+  }
 }
 
 abstract class TypeDefiningElementImpl2 extends ElementImpl2

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

@@ -89,7 +89,7 @@ class ReplaceTopBottomVisitor {
       );
     }
 
-    return aliasElement.instantiate(
+    return aliasElement.instantiateImpl(
       typeArguments: newTypeArguments,
       nullabilitySuffix: type.nullabilitySuffix,
     );

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

@@ -537,29 +537,29 @@ class FutureOrTypeImpl extends InterfaceTypeImpl {
 
 class InstantiatedTypeAliasElementImpl implements InstantiatedTypeAliasElement {
   @override
-  final TypeAliasElement element;
+  final TypeAliasElementImpl2 element2;
 
   @override
   final List<TypeImpl> typeArguments;
 
   InstantiatedTypeAliasElementImpl({
-    required this.element,
+    required this.element2,
     required this.typeArguments,
   });
 
   factory InstantiatedTypeAliasElementImpl.v2({
-    required TypeAliasElement2 element,
+    required TypeAliasElementImpl2 element,
     required List<TypeImpl> typeArguments,
   }) {
     return InstantiatedTypeAliasElementImpl(
-      element: element.asElement,
+      element2: element,
       typeArguments: typeArguments,
     );
   }
 
+  @Deprecated('Use element2 instead')
   @override
-  TypeAliasElementImpl2 get element2 =>
-      (element as TypeAliasFragment).element as TypeAliasElementImpl2;
+  TypeAliasElementImpl get element => element2.firstFragment;
 }
 
 /// A concrete implementation of an [InterfaceType].

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

@@ -731,7 +731,7 @@ class TypeSystemImpl implements TypeSystem {
   }) {
     var typeParameters = element.typeParameters2;
     var typeArguments = _defaultTypeArguments(typeParameters);
-    return element.instantiate(
+    return element.instantiateImpl(
       typeArguments: typeArguments,
       nullabilitySuffix: nullabilitySuffix,
     );

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

@@ -379,7 +379,7 @@ class AnnotationResolver {
       constructorElement,
       argumentList,
       (typeArguments) {
-        return typeAliasElement.instantiate(
+        return typeAliasElement.instantiateImpl(
           typeArguments: typeArguments,
           nullabilitySuffix: NullabilitySuffix.none,
         ) as InterfaceType;

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

@@ -843,7 +843,7 @@ class FunctionReferenceResolver {
       element.typeParameters2,
       CompileTimeErrorCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS,
     );
-    var type = element.instantiate(
+    var type = element.instantiateImpl(
       typeArguments: typeArguments,
       nullabilitySuffix: NullabilitySuffix.none,
     );

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

@@ -223,7 +223,7 @@ class NamedTypeResolver with ScopeHelpers {
           argumentList,
           element.typeParameters2.length,
         );
-        var type = element.instantiate(
+        var type = element.instantiateImpl(
           typeArguments: typeArguments,
           nullabilitySuffix: nullability,
         );

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

@@ -851,10 +851,12 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
             contextType: matchedType.unwrapTypeView(),
             nodeForTesting: pattern,
           );
-          return SharedTypeView(typeNode.type = typeNameElement.instantiate(
-            typeArguments: typeArguments,
-            nullabilitySuffix: NullabilitySuffix.none,
-          ));
+          return SharedTypeView(
+            typeNode.type = typeNameElement.instantiateImpl(
+              typeArguments: typeArguments,
+              nullabilitySuffix: NullabilitySuffix.none,
+            ),
+          );
         }
       }
     }

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

@@ -2216,7 +2216,7 @@ class ResolutionReader {
 
   TypeImpl _readAliasElementArguments(TypeImpl type) {
     var aliasElement = _readRawElement();
-    if (aliasElement is TypeAliasElement) {
+    if (aliasElement is TypeAliasElementImpl) {
       var aliasArguments = _readTypeList();
       if (type is DynamicTypeImpl) {
         // TODO(scheglov): add support for `dynamic` aliasing
@@ -2228,7 +2228,7 @@ class ResolutionReader {
           returnType: type.returnType,
           nullabilitySuffix: type.nullabilitySuffix,
           alias: InstantiatedTypeAliasElementImpl(
-            element: aliasElement,
+            element2: aliasElement.asElement2,
             typeArguments: aliasArguments,
           ),
         );
@@ -2238,7 +2238,7 @@ class ResolutionReader {
           typeArguments: type.typeArguments,
           nullabilitySuffix: type.nullabilitySuffix,
           alias: InstantiatedTypeAliasElementImpl(
-            element: aliasElement,
+            element2: aliasElement.asElement2,
             typeArguments: aliasArguments,
           ),
         );
@@ -2248,7 +2248,7 @@ class ResolutionReader {
           namedFields: type.namedFields,
           nullabilitySuffix: type.nullabilitySuffix,
           alias: InstantiatedTypeAliasElementImpl(
-            element: aliasElement,
+            element2: aliasElement.asElement2,
             typeArguments: aliasArguments,
           ),
         );
@@ -2257,7 +2257,7 @@ class ResolutionReader {
           element: type.element,
           nullabilitySuffix: type.nullabilitySuffix,
           alias: InstantiatedTypeAliasElementImpl(
-            element: aliasElement,
+            element2: aliasElement.asElement2,
             typeArguments: aliasArguments,
           ),
         );

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

@@ -869,18 +869,17 @@ class ResolutionSink extends _SummaryDataWriter {
     writeUInt30(elementIndex);
   }
 
-  void _writeElementList(List<Element> elements) {
+  void _writeElement2(Element2? element) {
+    _writeElement(element?.asElement);
+  }
+
+  void _writeElementList2(List<Element2> elements) {
     writeUInt30(elements.length);
     for (var element in elements) {
-      writeElement(element);
+      writeElement2(element);
     }
   }
 
-  void _writeElementList2(List<Element2> elements2) {
-    var elements = elements2.map((e) => e.asElement!).toList();
-    _writeElementList(elements);
-  }
-
   void _writeFormalParameters(
     List<ParameterElement> parameters, {
     required bool withAnnotations,
@@ -962,7 +961,7 @@ class ResolutionSink extends _SummaryDataWriter {
 
   void _writeTypeAliasElementArguments(TypeImpl type) {
     var alias = type.alias;
-    _writeElement(alias?.element);
+    _writeElement2(alias?.element2);
     if (alias != null) {
       _writeTypeList(alias.typeArguments);
     }