Add tests in class_test and mixin_test for type parameters in methods.

Make type parameter linking and error correction occur through a generic
method in `bundle_reader` and `element_builder` respectively.

Moved the generic type parameter method from `bundle_reader` to a static
method of `TypeParameterFragmentImpl` in `element`.

Fix a bug with augments where the last augment type is preserved instead
of the first.

Change-Id: I37a1cc54a3e73cfc2eb981a817b1d4bcf09f21dc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/448801
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>

Author: fshcheglov

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

@@ -443,6 +443,10 @@ class ClassElementImpl extends InterfaceElementImpl implements ClassElement {
       previous.addFragment(current);
       return current;
     });
+    TypeParameterFragmentImpl._linkFragments(
+      fragments,
+      getFragments: (f) => f.typeParameters,
+    );
   }
 
   @override
@@ -1015,12 +1019,6 @@ mixin DeferredResolutionReadingMixin {
     _applyResolutionConstantOffsets = callback;
   }
 
-  void withoutLoadingResolution(void Function() operation) {
-    _lockResolutionLoading++;
-    operation();
-    _lockResolutionLoading--;
-  }
-
   void _ensureReadResolution() {
     if (_lockResolutionLoading > 0) {
       return;
@@ -1037,6 +1035,12 @@ mixin DeferredResolutionReadingMixin {
       }
     }
   }
+
+  static void withoutLoadingResolution(void Function() operation) {
+    _lockResolutionLoading++;
+    operation();
+    _lockResolutionLoading--;
+  }
 }
 
 class DirectiveUriImpl implements DirectiveUri {}
@@ -7860,6 +7864,10 @@ class MethodElementImpl extends ExecutableElementImpl
       previous.addFragment(current);
       return current;
     });
+    TypeParameterFragmentImpl._linkFragments(
+      fragments,
+      getFragments: (f) => f.typeParameters,
+    );
   }
 }
 
@@ -7923,6 +7931,11 @@ class MethodFragmentImpl extends ExecutableFragmentImpl
     fragment.previousFragment = this;
     nextFragment = fragment;
   }
+
+  void addTypeParameter(TypeParameterFragmentImpl typeParameter) {
+    _typeParameters.add(typeParameter);
+    typeParameter.enclosingFragment = this;
+  }
 }
 
 @elementClass
@@ -8055,6 +8068,10 @@ class MixinElementImpl extends InterfaceElementImpl implements MixinElement {
       previous.addFragment(current);
       return current;
     });
+    TypeParameterFragmentImpl._linkFragments(
+      fragments,
+      getFragments: (f) => f.typeParameters,
+    );
   }
 }
 
@@ -10524,6 +10541,23 @@ class TypeParameterFragmentImpl extends FragmentImpl
     fragment.previousFragment = this;
     nextFragment = fragment;
   }
+
+  static void _linkFragments<T extends FragmentImpl>(
+    List<T> fragments, {
+    required List<TypeParameterFragmentImpl> Function(T) getFragments,
+  }) {
+    DeferredResolutionReadingMixin.withoutLoadingResolution(() {
+      var firstFragments = getFragments(fragments.first);
+      for (var i = 0; i < firstFragments.length; i++) {
+        // Side effect: set element for the fragment.
+        TypeParameterElementImpl(firstFragment: firstFragments[i]);
+        fragments.reduce((previous, current) {
+          getFragments(previous)[i].addFragment(getFragments(current)[i]);
+          return current;
+        });
+      }
+    });
+  }
 }
 
 abstract class VariableElementImpl extends ElementImpl

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

@@ -266,18 +266,6 @@ class LibraryReader {
       var element = ClassElementImpl(reference, fragments.first);
       element.linkFragments(fragments);
 
-      element.withoutLoadingResolution(() {
-        var typeParameterFragments = fragments.first.typeParameters;
-        for (var i = 0; i < typeParameterFragments.length; i++) {
-          // Side effect: set element for the fragment.
-          TypeParameterElementImpl(firstFragment: typeParameterFragments[i]);
-          fragments.reduce((previous, current) {
-            previous.typeParameters[i].addFragment(current.typeParameters[i]);
-            return current;
-          });
-        }
-      });
-
       element.readModifiers(_reader);
       element.hasNonFinalField = _reader.readBool();
 
@@ -913,6 +901,7 @@ class LibraryReader {
         firstFragment: fragments.first,
       );
       element.linkFragments(fragments);
+
       element.readModifiers(_reader);
       element.typeInferenceError = _readTopLevelInferenceError();
 
@@ -970,6 +959,7 @@ class LibraryReader {
       var fragments = _readFragmentsById<MixinFragmentImpl>();
       var element = MixinElementImpl(reference, fragments.first);
       element.linkFragments(fragments);
+
       element.readModifiers(_reader);
       element.hasNonFinalField = _reader.readBool();
 

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

@@ -194,30 +194,11 @@ class ElementBuilder {
     if (fragment.isAugmentation && lastFragment is ClassFragmentImpl) {
       lastFragment.addFragment(fragment);
 
-      var lastTypeParameterFragments = lastFragment.typeParameters;
-
-      // Trim extra type parameters.
-      if (lastTypeParameterFragments.length < fragment.typeParameters.length) {
-        fragment.typeParameters.length = lastTypeParameterFragments.length;
-      }
-
-      // Add missing type parameters.
-      if (lastTypeParameterFragments.length > fragment.typeParameters.length) {
-        for (
-          var i = fragment.typeParameters.length;
-          i < lastTypeParameterFragments.length;
-          i++
-        ) {
-          fragment.addTypeParameter(
-            TypeParameterFragmentImpl(name: lastTypeParameterFragments[i].name)
-              ..isSynthetic = true,
-          );
-        }
-      }
-
-      for (var i = 0; i < lastTypeParameterFragments.length; i++) {
-        lastTypeParameterFragments[i].addFragment(fragment.typeParameters[i]);
-      }
+      _linkTypeParameters(
+        lastFragments: lastFragment.typeParameters,
+        fragments: fragment.typeParameters,
+        add: fragment.addTypeParameter,
+      );
       return;
     }
 
@@ -227,6 +208,7 @@ class ElementBuilder {
     );
 
     for (var typeParameterFragment in fragment.typeParameters) {
+      // Side effect: set element for the fragment.
       TypeParameterElementImpl(firstFragment: typeParameterFragment);
     }
 
@@ -471,9 +453,21 @@ class ElementBuilder {
 
     if (lastFragment is MethodFragmentImpl && fragment.isAugmentation) {
       lastFragment.addFragment(fragment);
+
+      _linkTypeParameters(
+        lastFragments: lastFragment.typeParameters,
+        fragments: fragment.typeParameters,
+        add: fragment.addTypeParameter,
+      );
+
       return;
     }
 
+    for (var typeParameterFragment in fragment.typeParameters) {
+      // Side effect: set element for the fragment.
+      TypeParameterElementImpl(firstFragment: typeParameterFragment);
+    }
+
     instanceElement.addMethod(
       MethodElementImpl(
         name: fragment.name,
@@ -549,16 +543,28 @@ class ElementBuilder {
   ) {
     assert(!fragment.isSynthetic);
     libraryFragment.addMixin(fragment);
-
     if (fragment.isAugmentation && lastFragment is MixinFragmentImpl) {
       lastFragment.addFragment(fragment);
+
+      _linkTypeParameters(
+        lastFragments: lastFragment.typeParameters,
+        fragments: fragment.typeParameters,
+        add: fragment.addTypeParameter,
+      );
+
       return;
     }
 
     var element = MixinElementImpl(
       _addTopReference('@mixin', fragment.name),
       fragment,
     );
+
+    for (var typeParameterFragment in fragment.typeParameters) {
+      // Side effect: set element for the fragment.
+      TypeParameterElementImpl(firstFragment: typeParameterFragment);
+    }
+
     libraryElement.addMixin(element);
     libraryBuilder.declare(element, element.reference);
   }
@@ -766,6 +772,31 @@ class ElementBuilder {
     }
   }
 
+  void _linkTypeParameters<T extends FragmentImpl>({
+    required List<TypeParameterFragmentImpl> lastFragments,
+    required List<TypeParameterFragmentImpl> fragments,
+    required void Function(TypeParameterFragmentImpl) add,
+  }) {
+    // Trim extra type parameters.
+    if (lastFragments.length < fragments.length) {
+      fragments.length = lastFragments.length;
+    }
+
+    // Synthesize missing type parameters.
+    if (lastFragments.length > fragments.length) {
+      for (var i = fragments.length; i < lastFragments.length; i++) {
+        add(
+          TypeParameterFragmentImpl(name: lastFragments[i].name)
+            ..isSynthetic = true,
+        );
+      }
+    }
+
+    for (var i = 0; i < lastFragments.length; i++) {
+      lastFragments[i].addFragment(fragments[i]);
+    }
+  }
+
   TopLevelVariableElementImpl? _topLevelVariableElement(
     FragmentImpl? fragment,
   ) {