Fine. Match type parameters of InstanceItem(s).

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

Author: scheglov

pkg/analyzer/lib/src/fine/manifest_item.dart

@@ -204,7 +204,6 @@ class ExtensionItem<E extends ExtensionElementImpl2> extends InstanceItem<E> {
 
   @override
   bool match(MatchContext context, E element) {
-    context.addTypeParameters(element.typeParameters2);
     return super.match(context, element) &&
         extendedType.match(context, element.extendedType);
   }
@@ -469,10 +468,17 @@ sealed class InstanceItem<E extends InstanceElementImpl2>
     return declaredSetters[name]?.id ?? declaredConflicts[name];
   }
 
+  @override
+  bool match(MatchContext context, E element) {
+    context.addTypeParameters(element.typeParameters2);
+    return super.match(context, element) &&
+        typeParameters.match(context, element.typeParameters2);
+  }
+
   @override
   void write(BufferedSink sink) {
     super.write(sink);
-    typeParameters.writeList(sink);
+    typeParameters.write(sink);
     declaredConflicts.write(sink);
     declaredFields.write(sink);
     declaredGetters.write(sink);
@@ -843,7 +849,6 @@ sealed class InterfaceItem<E extends InterfaceElementImpl2>
 
   @override
   bool match(MatchContext context, E element) {
-    context.addTypeParameters(element.typeParameters2);
     return super.match(context, element) &&
         supertype.match(context, element.supertype) &&
         interfaces.match(context, element.interfaces) &&
@@ -1415,7 +1420,7 @@ class TypeAliasItem extends TopLevelItem<TypeAliasElementImpl2> {
   @override
   void write(BufferedSink sink) {
     super.write(sink);
-    typeParameters.writeList(sink);
+    typeParameters.write(sink);
     aliasedType.write(sink);
   }
 }

pkg/analyzer/lib/src/fine/manifest_type.dart

@@ -219,11 +219,7 @@ final class ManifestFunctionType extends ManifestType {
     }
 
     return context.withTypeParameters(type.typeParameters, () {
-      if (!ManifestTypeParameter.matchList(
-        context,
-        typeParameters,
-        type.typeParameters,
-      )) {
+      if (!typeParameters.match(context, type.typeParameters)) {
         return false;
       }
 
@@ -625,26 +621,6 @@ class ManifestTypeParameter {
     bound.writeOptional(sink);
   }
 
-  static bool matchList(
-    MatchContext context,
-    List<ManifestTypeParameter> manifests,
-    List<TypeParameterElement> elements,
-  ) {
-    if (manifests.length != elements.length) {
-      return false;
-    }
-
-    for (var i = 0; i < manifests.length; i++) {
-      var manifest = manifests[i];
-      var element = elements[i];
-      if (!manifest.match(context, element)) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
   static List<ManifestTypeParameter> readList(SummaryDataReader reader) {
     return reader.readTypedList(() => ManifestTypeParameter.read(reader));
   }
@@ -793,7 +769,19 @@ extension ListOfManifestTypeExtension on List<ManifestType> {
 }
 
 extension ListOfManifestTypeParameterExtension on List<ManifestTypeParameter> {
-  void writeList(BufferedSink sink) {
+  bool match(MatchContext context, List<TypeParameterElement> elements) {
+    if (elements.length != length) {
+      return false;
+    }
+    for (var i = 0; i < length; i++) {
+      if (!this[i].match(context, elements[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  void write(BufferedSink sink) {
     sink.writeList(this, (x) => x.write(sink));
   }
 }