Elements. Add reference to MethodElementImpl, write it.

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

Author: scheglov

pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart

@@ -373,7 +373,7 @@ class A {
 ''');
 
     _assertSelectionState(selectionState, r'''
-element: self::@fragment::self::@class::A::@method::test
+element: self::@class::A::@method::test
 formalParameters
   id: 0
     kind: requiredPositional

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -110,7 +110,7 @@ testFineAfterLibraryAnalyzerHook;
 // TODO(scheglov): Clean up the list of implicitly analyzed files.
 class AnalysisDriver {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 462;
+  static const int DATA_VERSION = 463;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.

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

@@ -7527,13 +7527,23 @@ class MethodElementImpl2 extends ExecutableElementImpl2
         FragmentedElementMixin<MethodFragmentImpl>,
         _HasSinceSdkVersionMixin
     implements MethodElement2OrMember {
+  @override
+  final Reference reference;
+
   @override
   final String? name3;
 
   @override
   final MethodFragmentImpl firstFragment;
 
-  MethodElementImpl2(this.name3, this.firstFragment);
+  MethodElementImpl2({
+    required this.name3,
+    required this.reference,
+    required this.firstFragment,
+  }) {
+    reference.element2 = this;
+    firstFragment.element = this;
+  }
 
   @override
   MethodElementImpl2 get baseElement => this;
@@ -7599,7 +7609,7 @@ abstract class MethodElementOrMember implements ExecutableElementOrMember {
 class MethodFragmentImpl extends ExecutableFragmentImpl
     implements MethodElementOrMember, MethodFragment {
   @override
-  late final MethodElementImpl2 element = MethodElementImpl2(name, this);
+  late final MethodElementImpl2 element;
 
   @override
   String? name2;

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

@@ -1156,12 +1156,35 @@ class InheritanceManager3 {
     }
 
     if (executable is MethodElementOrMember) {
-      var result = MethodFragmentImpl(name: executable.name, nameOffset: -1);
+      var fragmentName = executable.name;
+      var fragmentReference = class_.reference!
+          .getChild('@method')
+          .getChild(fragmentName);
+
+      if (fragmentReference.element case MethodFragmentImpl result) {
+        return result;
+      }
+
+      var result = MethodFragmentImpl(name: fragmentName, nameOffset: -1);
+      result.reference = fragmentReference;
+      fragmentReference.element = result;
       result.enclosingElement3 = class_;
       result.isSynthetic = true;
       result.parameters = transformedParameters;
       result.returnType = executable.returnType;
       result.typeParameters = executable.typeParameters;
+
+      var elementName = executable.asElement2.name3!;
+      var elementReference = class_.element.reference!
+          .getChild('@method')
+          .getChild(elementName);
+      assert(elementReference.element2 == null);
+      MethodElementImpl2(
+        name3: elementName,
+        reference: elementReference,
+        firstFragment: result,
+      );
+
       return result;
     }
 
@@ -1216,9 +1239,20 @@ class InheritanceManager3 {
     }
 
     if (first is MethodElementOrMember) {
-      var firstMethod = first;
-      var fragmentName = first.asElement2.firstFragment.name2;
-      var result = MethodFragmentImpl(name: firstMethod.name, nameOffset: -1);
+      var firstElement = first.asElement2;
+      var fragmentName = firstElement.firstFragment.name2!;
+
+      var fragmentReference = targetClass.reference!
+          .getChild('@method')
+          .getChild(fragmentName);
+
+      if (fragmentReference.element case MethodFragmentImpl result) {
+        return result;
+      }
+
+      var result = MethodFragmentImpl(name: first.name, nameOffset: -1);
+      result.reference = fragmentReference;
+      fragmentReference.element = result;
       result.enclosingElement3 = targetClass;
       result.name2 = fragmentName;
       result.typeParameters = resultType.typeFormals;
@@ -1228,6 +1262,18 @@ class InheritanceManager3 {
           resultType.parameters
               .map((e) => e.firstFragment as FormalParameterFragmentImpl)
               .toList();
+
+      var elementName = first.asElement2.name3!;
+      var elementReference = targetClass.element.reference!
+          .getChild('@method')
+          .getChild(elementName);
+      assert(elementReference.element2 == null);
+      MethodElementImpl2(
+        name3: elementName,
+        reference: elementReference,
+        firstFragment: result,
+      );
+
       return result;
     } else {
       var firstAccessor = first as PropertyAccessorElementOrMember;

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

@@ -1270,6 +1270,7 @@ class LibraryReader {
     return _reader.readTypedList(() {
       var resolutionOffset = _baseResolutionOffset + _reader.readUInt30();
       var reference = _readReference();
+      var reference2 = _readReference();
       var fragmentName = _readFragmentName();
       // TODO(scheglov): we do this only because MethodElement2 uses this name.
       var name = _reader.readStringReference();
@@ -1287,6 +1288,13 @@ class LibraryReader {
       fragment.typeParameters = _readTypeParameters();
       fragment.parameters = _readParameters();
       fragment.typeInferenceError = _readTopLevelInferenceError();
+
+      MethodElementImpl2(
+        name3: name,
+        reference: reference2,
+        firstFragment: fragment,
+      );
+
       return fragment;
     });
   }

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

@@ -424,6 +424,7 @@ class BundleWriter {
   void _writeMethodElement(MethodFragmentImpl fragment) {
     _sink.writeUInt30(_resolutionSink.offset);
     _writeReference(fragment);
+    _writeReference2(fragment.element.reference);
     _writeFragmentName(fragment);
     _sink._writeStringReference(fragment.name);
     MethodElementFlags.write(_sink, fragment);
@@ -721,7 +722,6 @@ class ResolutionSink extends _SummaryDataWriter {
       case FieldElementImpl2():
       case FormalParameterElementImpl():
       case GetterElementImpl():
-      case MethodElementImpl2():
       case SetterElementImpl():
       case TypeParameterElementImpl2():
         // TODO(scheglov): eventually stop using fragments here.

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

@@ -1263,6 +1263,17 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
 
       reference = _enclosingContext.addMethod(refName, fragment);
       executableFragment = fragment;
+
+      var containerBuilder = _enclosingContext.instanceElementBuilder!;
+      var containerElement = containerBuilder.element;
+      var containerRef = containerElement.reference!.getChild('@method');
+      var elementReference = containerRef.addChild(refName);
+
+      MethodElementImpl2(
+        name3: name,
+        reference: elementReference,
+        firstFragment: fragment,
+      );
     }
     executableFragment.hasImplicitReturnType = node.returnType == null;
     executableFragment.invokesSuperSelf = node.invokesSuperSelf;

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

@@ -214,11 +214,12 @@ class LinkedElementFactory {
     }
 
     var parentRef = reference.parentNotContainer;
-    var parentElement = elementOfReference(parentRef);
+    var parentElement = elementOfReference3(parentRef);
 
     // Only classes delay creating children.
-    if (parentElement is ClassFragmentImpl) {
-      parentElement.linkedData?.readMembers(parentElement);
+    if (parentElement is ClassElementImpl2) {
+      var firstFragment = parentElement.firstFragment;
+      firstFragment.linkedData?.readMembers(firstFragment);
     }
 
     var element = reference.element2;

pkg/analyzer/lib/src/test_utilities/mock_sdk_elements.dart

@@ -1093,6 +1093,11 @@ class _MockSdkElementsBuilder {
                   .toList()
           ..returnType = returnType
           ..typeParameters = typeFormals;
+    MethodElementImpl2(
+      name3: name,
+      reference: Reference.root(),
+      firstFragment: fragment,
+    );
     return fragment;
   }
 

pkg/analyzer/test/generated/elements_types_mixin.dart

@@ -445,11 +445,18 @@ mixin ElementsTypesMixin {
     List<TypeParameterElementImpl2> typeParameters = const [],
     List<FormalParameterElementImpl> formalParameters = const [],
   }) {
-    return MethodFragmentImpl(name: name, nameOffset: 0)
-      ..isStatic = isStatic
-      ..parameters = formalParameters.map((e) => e.asElement).toList()
-      ..returnType = returnType
-      ..typeParameters = typeParameters.map((e) => e.asElement).toList();
+    var fragment =
+        MethodFragmentImpl(name: name, nameOffset: 0)
+          ..isStatic = isStatic
+          ..parameters = formalParameters.map((e) => e.asElement).toList()
+          ..returnType = returnType
+          ..typeParameters = typeParameters.map((e) => e.asElement).toList();
+    MethodElementImpl2(
+      name3: name,
+      reference: Reference.root(),
+      firstFragment: fragment,
+    );
+    return fragment;
   }
 
   MixinFragmentImpl mixin_({