[analyzer] Use InterfaceElementImpl2 when interfacing with shared code.

Change the analyzer's use of the following shared generic types so
that it supplies the type parameter `InterfaceElementImpl2` instead of
`InterfaceElement` as the type it uses to represent interfaces:

- `MergedTypeConstraint`
- `TypeAnalyzer`
- `TypeAnalyzerOperations`
- `TypeAnalyzerOperationsMixin`
- `TypeConstraintFromArgument`
- `TypeConstraintFromExtendsClause`
- `TypeConstraintFromFunctionContext`
- `TypeConstraintFromReturnType`
- `TypeConstraintGenerator`
- `TypeConstraintGeneratorMixin`
- `TypeConstraintOrigin`
- `TypeDeclarationMatchResult`
- `UnknownTypeConstraintOrigin`

To avoid type casts, I tightened up the return type of
`InterfaceTypeImpl.element3` so that it returns
`InterfaceElementImpl2` instead of `InterfaceElement2`. The analyzer
public API is unchanged, though--`InterfaceType.element3` still has a
return type of `InterfaceElement2`--so clients should be unaffected.

This is part of a larger arc of work to change the analyzer's use of
the shared code so that the type parameters it supplies are not part
of the analyzer public API. See
#59763.

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

Author: stereotype441

pkg/analyzer/analyzer_use_new_elements.txt

@@ -85,7 +85,6 @@ lib/src/dart/resolver/this_lookup.dart
 lib/src/dart/resolver/type_property_resolver.dart
 lib/src/dart/resolver/typed_literal_resolver.dart
 lib/src/dart/resolver/variable_declaration_resolver.dart
-lib/src/dart/resolver/yield_statement_resolver.dart
 lib/src/diagnostic/diagnostic_factory.dart
 lib/src/error/best_practices_verifier.dart
 lib/src/error/correct_override.dart

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

@@ -683,7 +683,8 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
       .toList();
 
   @override
-  InterfaceElement2 get element3 => (element as InterfaceFragment).element;
+  InterfaceElementImpl2 get element3 =>
+      (element as InterfaceElementImpl).element;
 
   @override
   List<GetterElement> get getters => accessors

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

@@ -20,7 +20,6 @@ import 'package:_fe_analyzer_shared/src/type_inference/type_constraint.dart'
         TypeConstraintOrigin,
         UnknownTypeConstraintOrigin;
 import 'package:_fe_analyzer_shared/src/types/shared_type.dart';
-import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/dart/element/element.dart';
@@ -39,20 +38,20 @@ typedef MergedTypeConstraint = shared.MergedTypeConstraint<
     TypeParameterElementImpl2,
     PromotableElementImpl2,
     InterfaceType,
-    InterfaceElement>;
+    InterfaceElementImpl2>;
 
 /// Instance of [shared.TypeConstraintFromArgument] specific to the Analyzer.
 typedef TypeConstraintFromArgument = shared.TypeConstraintFromArgument<
     DartType,
     PromotableElementImpl2,
     TypeParameterElementImpl2,
     InterfaceType,
-    InterfaceElement>;
+    InterfaceElementImpl2>;
 
 /// Instance of [shared.TypeConstraintFromExtendsClause] specific to the Analyzer.
 typedef TypeConstraintFromExtendsClause
     = shared.TypeConstraintFromExtendsClause<DartType, PromotableElementImpl2,
-        TypeParameterElementImpl2, InterfaceType, InterfaceElement>;
+        TypeParameterElementImpl2, InterfaceType, InterfaceElementImpl2>;
 
 /// Instance of [shared.TypeConstraintFromFunctionContext] specific to the Analyzer.
 typedef TypeConstraintFromFunctionContext
@@ -63,7 +62,7 @@ typedef TypeConstraintFromFunctionContext
         PromotableElementImpl2,
         TypeParameterElementImpl2,
         InterfaceType,
-        InterfaceElement>;
+        InterfaceElementImpl2>;
 
 /// Instance of [shared.TypeConstraintFromReturnType] specific to the Analyzer.
 typedef TypeConstraintFromReturnType = shared.TypeConstraintFromReturnType<
@@ -73,23 +72,23 @@ typedef TypeConstraintFromReturnType = shared.TypeConstraintFromReturnType<
     PromotableElementImpl2,
     TypeParameterElementImpl2,
     InterfaceType,
-    InterfaceElement>;
+    InterfaceElementImpl2>;
 
 /// Instance of [shared.TypeConstraintOrigin] specific to the Analyzer.
 typedef TypeConstraintOrigin = shared.TypeConstraintOrigin<
     DartType,
     PromotableElementImpl2,
     TypeParameterElementImpl2,
     InterfaceType,
-    InterfaceElement>;
+    InterfaceElementImpl2>;
 
 /// Instance of [shared.UnknownTypeConstraintOrigin] specific to the Analyzer.
 typedef UnknownTypeConstraintOrigin = shared.UnknownTypeConstraintOrigin<
     DartType,
     PromotableElementImpl2,
     TypeParameterElementImpl2,
     InterfaceType,
-    InterfaceElement>;
+    InterfaceElementImpl2>;
 
 /// Creates sets of [GeneratedTypeConstraint]s for type parameters, based on an
 /// attempt to make one type schema a subtype of another.
@@ -99,7 +98,7 @@ class TypeConstraintGatherer extends shared.TypeConstraintGenerator<
         PromotableElementImpl2,
         TypeParameterElementImpl2,
         InterfaceType,
-        InterfaceElement,
+        InterfaceElementImpl2,
         AstNode>
     with
         shared.TypeConstraintGeneratorMixin<
@@ -108,7 +107,7 @@ class TypeConstraintGatherer extends shared.TypeConstraintGenerator<
             PromotableElementImpl2,
             TypeParameterElementImpl2,
             InterfaceType,
-            InterfaceElement,
+            InterfaceElementImpl2,
             AstNode> {
   @override
   final Set<TypeParameterElementImpl2> typeParametersToConstrain =
@@ -213,9 +212,9 @@ class TypeConstraintGatherer extends shared.TypeConstraintGenerator<
 
   @override
   List<DartType>? getTypeArgumentsAsInstanceOf(
-      InterfaceType type, InterfaceElement typeDeclaration) {
+      InterfaceType type, InterfaceElementImpl2 typeDeclaration) {
     for (var interface in type.element.allSupertypes) {
-      if (interface.element == typeDeclaration) {
+      if (interface.element3 == typeDeclaration) {
         var substitution = Substitution.fromInterfaceType(type);
         var substitutedInterface =
             substitution.substituteType(interface) as InterfaceType;

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

@@ -424,10 +424,10 @@ class FlowAnalysisHelper {
 class TypeSystemOperations
     with
         TypeAnalyzerOperationsMixin<DartType, PromotableElementImpl2,
-            TypeParameterElementImpl2, InterfaceType, InterfaceElement>
+            TypeParameterElementImpl2, InterfaceType, InterfaceElementImpl2>
     implements
         TypeAnalyzerOperations<DartType, PromotableElementImpl2,
-            TypeParameterElementImpl2, InterfaceType, InterfaceElement> {
+            TypeParameterElementImpl2, InterfaceType, InterfaceElementImpl2> {
   final bool strictCasts;
   final TypeSystemImpl typeSystem;
 
@@ -529,10 +529,8 @@ class TypeSystemOperations
 
   @override
   Variance getTypeParameterVariance(
-      InterfaceElement typeDeclaration, int parameterIndex) {
-    return (typeDeclaration.typeParameters[parameterIndex]
-            as TypeParameterElementImpl)
-        .variance;
+      InterfaceElementImpl2 typeDeclaration, int parameterIndex) {
+    return typeDeclaration.typeParameters2[parameterIndex].variance;
   }
 
   @override
@@ -740,21 +738,21 @@ class TypeSystemOperations
   }
 
   @override
-  TypeDeclarationMatchResult<InterfaceType, InterfaceElement, DartType>?
+  TypeDeclarationMatchResult<InterfaceType, InterfaceElementImpl2, DartType>?
       matchTypeDeclarationTypeInternal(DartType type) {
     if (isInterfaceTypeInternal(type)) {
-      InterfaceType interfaceType = type as InterfaceType;
+      InterfaceTypeImpl interfaceType = type as InterfaceTypeImpl;
       return TypeDeclarationMatchResult(
           typeDeclarationKind: TypeDeclarationKind.interfaceDeclaration,
           typeDeclarationType: interfaceType,
-          typeDeclaration: interfaceType.element,
+          typeDeclaration: interfaceType.element3,
           typeArguments: interfaceType.typeArguments);
     } else if (isExtensionTypeInternal(type)) {
-      InterfaceType interfaceType = type as InterfaceType;
+      InterfaceTypeImpl interfaceType = type as InterfaceTypeImpl;
       return TypeDeclarationMatchResult(
           typeDeclarationKind: TypeDeclarationKind.extensionTypeDeclaration,
           typeDeclarationType: interfaceType,
-          typeDeclaration: interfaceType.element,
+          typeDeclaration: interfaceType.element3,
           typeArguments: interfaceType.typeArguments);
     } else {
       return null;

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

@@ -130,7 +130,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
             void,
             TypeParameterElementImpl2,
             InterfaceType,
-            InterfaceElement>,
+            InterfaceElementImpl2>,
         // TODO(paulberry): not yet used.
         NullShortingMixin<Null, Expression, SharedTypeView<DartType>> {
   /// Debug-only: if `true`, manipulations of [_rewriteStack] performed by
@@ -457,7 +457,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
       PromotableElementImpl2,
       TypeParameterElementImpl2,
       InterfaceType,
-      InterfaceElement> get operations => flowAnalysis.typeOperations;
+      InterfaceElementImpl2> get operations => flowAnalysis.typeOperations;
 
   /// Gets the current depth of the [_rewriteStack].  This may be used in
   /// assertions to verify that pushes and pops are properly balanced.