Update top level function tests for augmentation.

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

Author: fshcheglov

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

@@ -2440,6 +2440,11 @@ abstract class ExecutableFragmentImpl extends FunctionTypedFragmentImpl
   @Deprecated('Use typeParameters instead')
   @override
   List<TypeParameterFragmentImpl> get typeParameters2 => typeParameters;
+
+  void addTypeParameter(TypeParameterFragmentImpl fragment) {
+    _typeParameters.add(fragment);
+    fragment.enclosingFragment = this;
+  }
 }
 
 @elementClass
@@ -3384,6 +3389,12 @@ class FormalParameterFragmentImpl extends VariableFragmentImpl
   /// The element corresponding to this fragment.
   FormalParameterElementImpl? _element;
 
+  @override
+  FormalParameterFragmentImpl? nextFragment;
+
+  @override
+  FormalParameterFragmentImpl? previousFragment;
+
   /// Initialize a newly created parameter element to have the given [name] and
   /// [nameOffset].
   FormalParameterFragmentImpl({
@@ -3521,14 +3532,6 @@ class FormalParameterFragmentImpl extends VariableFragmentImpl
   @override
   String? get name2 => name;
 
-  @override
-  // TODO(augmentations): Support chaining between the fragments.
-  FormalParameterFragmentImpl? get nextFragment => null;
-
-  @override
-  // TODO(augmentations): Support chaining between the fragments.
-  FormalParameterFragmentImpl? get previousFragment => null;
-
   /// The type parameters defined by this parameter.
   ///
   /// A parameter will only define type parameters if it is a function typed
@@ -3546,9 +3549,40 @@ class FormalParameterFragmentImpl extends VariableFragmentImpl
     _typeParameters = typeParameters;
   }
 
+  void addFragment(FormalParameterFragmentImpl fragment) {
+    fragment.element = element;
+    fragment.previousFragment = this;
+    nextFragment = fragment;
+  }
+
   FormalParameterElementImpl _createElement(
     FormalParameterFragment firstFragment,
   ) => FormalParameterElementImpl(firstFragment as FormalParameterFragmentImpl);
+
+  static void _linkFragments<T extends FragmentImpl>(
+    List<T> fragments, {
+    required List<FormalParameterFragmentImpl> Function(T) getFragments,
+  }) {
+    DeferredResolutionReadingMixin.withoutLoadingResolution(() {
+      var firstFormalParameters = getFragments(fragments.first);
+      for (var i = 0; i < firstFormalParameters.length; i++) {
+        // Side effect: set element for the fragment.
+        var first = firstFormalParameters[i];
+        switch (first) {
+          case FieldFormalParameterFragmentImpl():
+            FieldFormalParameterElementImpl(first);
+          case SuperFormalParameterFragmentImpl():
+            SuperFormalParameterElementImpl(first);
+          default:
+            FormalParameterElementImpl(first);
+        }
+        fragments.reduce((previous, current) {
+          getFragments(previous)[i].addFragment(getFragments(current)[i]);
+          return current;
+        });
+      }
+    });
+  }
 }
 
 @GenerateFragmentImpl(modifiers: _FragmentImplModifiers.values)
@@ -8332,6 +8366,7 @@ class MethodFragmentImpl extends ExecutableFragmentImpl
     nextFragment = fragment;
   }
 
+  @override
   void addTypeParameter(TypeParameterFragmentImpl typeParameter) {
     _typeParameters.add(typeParameter);
     typeParameter.enclosingFragment = this;
@@ -10116,6 +10151,14 @@ class TopLevelFunctionElementImpl extends ExecutableElementImpl
       previous.addFragment(current);
       return current;
     });
+    TypeParameterFragmentImpl._linkFragments(
+      fragments,
+      getFragments: (f) => f.typeParameters,
+    );
+    FormalParameterFragmentImpl._linkFragments(
+      fragments,
+      getFragments: (f) => f.formalParameters,
+    );
   }
 }
 

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

@@ -616,6 +616,17 @@ class ElementBuilder {
     if (lastFragment is TopLevelFunctionFragmentImpl &&
         fragment.isAugmentation) {
       lastFragment.addFragment(fragment);
+
+      _linkTypeParameters(
+        lastFragments: lastFragment.typeParameters,
+        fragments: fragment.typeParameters,
+        add: fragment.addTypeParameter,
+      );
+
+      fragment.formalParameters = _linkFormalParameters(
+        lastFragments: lastFragment.formalParameters,
+        fragments: fragment.formalParameters,
+      );
       return;
     }
 
@@ -809,7 +820,82 @@ class ElementBuilder {
     }
   }
 
-  void _linkTypeParameters<T extends FragmentImpl>({
+  List<FormalParameterFragmentImpl> _linkFormalParameters({
+    required List<FormalParameterFragmentImpl> lastFragments,
+    required List<FormalParameterFragmentImpl> fragments,
+  }) {
+    int getPositionalSize(List<FormalParameterFragmentImpl> fragments) {
+      return fragments.takeWhile((f) => f.isPositional).length;
+    }
+
+    FormalParameterFragmentImpl createFragment(
+      FormalParameterFragmentImpl lastParameter,
+    ) {
+      switch (lastParameter) {
+        case FieldFormalParameterFragmentImpl():
+          return FieldFormalParameterFragmentImpl(
+            name: lastParameter.name,
+            nameOffset: null,
+            parameterKind: lastParameter.parameterKind,
+          )..isSynthetic = true;
+        case SuperFormalParameterFragmentImpl():
+          return SuperFormalParameterFragmentImpl(
+            name: lastParameter.name,
+            nameOffset: null,
+            parameterKind: lastParameter.parameterKind,
+          )..isSynthetic = true;
+        default:
+          return FormalParameterFragmentImpl(
+            name: lastParameter.name,
+            nameOffset: null,
+            parameterKind: lastParameter.parameterKind,
+          )..isSynthetic = true;
+      }
+    }
+
+    var positionalSize = getPositionalSize(fragments);
+    var positional = fragments.sublist(0, positionalSize);
+    var named = fragments.sublist(positionalSize);
+
+    var lastPositionalSize = getPositionalSize(lastFragments);
+    var lastPositional = lastFragments.sublist(0, lastPositionalSize);
+    var lastNamed = lastFragments.sublist(lastPositionalSize);
+
+    // Trim extra positional parameters.
+    if (lastPositional.length < positional.length) {
+      positional.length = lastPositional.length;
+    }
+
+    // Synthesize missing positional parameters.
+    if (lastPositional.length > positional.length) {
+      for (var i = positional.length; i < lastPositional.length; i++) {
+        var lastParameter = lastPositional[i];
+        positional.add(createFragment(lastParameter));
+      }
+    }
+
+    for (var i = 0; i < lastPositional.length; i++) {
+      lastPositional[i].addFragment(positional[i]);
+    }
+
+    var newNamed = <FormalParameterFragmentImpl>[];
+    var namedMap = <String, FormalParameterFragmentImpl>{};
+    for (var f in named) {
+      namedMap[f.name!] = f;
+    }
+
+    for (var lastParameter in lastNamed) {
+      var formalParameter = namedMap[lastParameter.name];
+      formalParameter ??= createFragment(lastParameter);
+
+      lastParameter.addFragment(formalParameter);
+      newNamed.add(formalParameter);
+    }
+
+    return [...positional, ...newNamed];
+  }
+
+  void _linkTypeParameters({
     required List<TypeParameterFragmentImpl> lastFragments,
     required List<TypeParameterFragmentImpl> fragments,
     required void Function(TypeParameterFragmentImpl) add,

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

@@ -412,6 +412,7 @@ class InformativeDataApplier {
     List<FormalParameterFragmentImpl> parameters,
     List<_InfoFormalParameter> infoList,
   ) {
+    parameters = parameters.where((p) => !p.isSynthetic).toList();
     forCorrespondingPairs(parameters, infoList, (element, info) {
       element.setCodeRange(info.codeOffset, info.codeLength);
       element.firstTokenOffset = info.firstTokenOffset;

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

@@ -382,7 +382,9 @@ class TypesBuilder {
 
   void _simpleFormalParameter(SimpleFormalParameterImpl node) {
     var fragment = node.declaredFragment!;
-    fragment.element.type = node.type?.type ?? _dynamicType;
+    if (fragment.previousFragment == null) {
+      fragment.element.type = node.type?.type ?? _dynamicType;
+    }
   }
 
   void _superFormalParameter(SuperFormalParameterImpl node) {

pkg/analyzer/test/src/summary/element_text.dart

@@ -758,10 +758,12 @@ class _Element2Writer extends _AbstractElementWriter {
       // _writeNonSyntheticElement(e);
       // _writeFieldFormalParameterField(e);
       // _writeSuperConstructorParameter(e);
+      _writeFragmentReference('previousFragment', f.previousFragment);
+      _writeFragmentReference('nextFragment', f.nextFragment);
     });
   }
 
-  void _writeFragentBodyModifiers(ExecutableFragment f) {
+  void _writeFragmentBodyModifiers(ExecutableFragment f) {
     if (f.isAsynchronous) {
       expect(f.isSynchronous, isFalse);
       _sink.write(' async');
@@ -1345,7 +1347,7 @@ class _Element2Writer extends _AbstractElementWriter {
       // _sink.writeIf(f.isExternal, 'external ');
 
       _writeFragmentName(f);
-      _writeFragentBodyModifiers(f);
+      _writeFragmentBodyModifiers(f);
     });
 
     _sink.withIndent(() {
@@ -1619,6 +1621,8 @@ class _Element2Writer extends _AbstractElementWriter {
       _writeElementReference('element', f.element);
       _writeDocumentation(f.documentationComment);
       _writeMetadata(f.metadata);
+      _writeFragmentReference('previousFragment', f.previousFragment);
+      _writeFragmentReference('nextFragment', f.nextFragment);
       // _writeCodeRange(e);
       _writeFragmentList(
         'typeParameters',