Elements. Add reference to ConstructorElementImpl2, write it.

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

Author: scheglov

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

@@ -178,7 +178,7 @@ class A {
 ''');
 
     _assertSelectionState(selectionState, r'''
-element: self::@fragment::self::@class::A::@constructor::new
+element: self::@class::A::@constructor::new
 formalParameters
   id: 0
     kind: requiredPositional
@@ -196,7 +196,7 @@ class A {
 ''');
 
     _assertSelectionState(selectionState, r'''
-element: self::@fragment::self::@class::A::@constructor::new
+element: self::@class::A::@constructor::new
 formalParameters
   id: 0
     kind: requiredPositional
@@ -213,7 +213,7 @@ class A {
 ''');
 
     _assertSelectionState(selectionState, r'''
-element: self::@fragment::self::@class::A::@constructor::named
+element: self::@class::A::@constructor::named
 formalParameters
   id: 0
     kind: requiredPositional
@@ -230,7 +230,7 @@ class A {
 ''');
 
     _assertSelectionState(selectionState, r'''
-element: self::@fragment::self::@class::A::@constructor::named
+element: self::@class::A::@constructor::named
 formalParameters
   id: 0
     kind: requiredPositional
@@ -247,7 +247,7 @@ class A {
 ''');
 
     _assertSelectionState(selectionState, r'''
-element: self::@fragment::self::@class::A::@constructor::named
+element: self::@class::A::@constructor::named
 formalParameters
   id: 0
     kind: requiredPositional
@@ -269,7 +269,7 @@ class B extends A {
 ''');
 
     _assertSelectionState(selectionState, r'''
-element: self::@fragment::self::@class::B::@constructor::new
+element: self::@class::B::@constructor::new
 formalParameters
   id: 0
     kind: optionalNamed
@@ -291,7 +291,7 @@ class B extends A {
 ''');
 
     _assertSelectionState(selectionState, r'''
-element: self::@fragment::self::@class::B::@constructor::new
+element: self::@class::B::@constructor::new
 formalParameters
   id: 0
     kind: optionalPositional
@@ -317,7 +317,7 @@ class B extends A {
 ''');
 
     _assertSelectionState(selectionState, r'''
-element: self::@fragment::self::@class::B::@constructor::new
+element: self::@class::B::@constructor::new
 formalParameters
   id: 0
     kind: requiredNamed
@@ -339,7 +339,7 @@ class B extends A {
 ''');
 
     _assertSelectionState(selectionState, r'''
-element: self::@fragment::self::@class::B::@constructor::new
+element: self::@class::B::@constructor::new
 formalParameters
   id: 0
     kind: requiredPositional
@@ -356,7 +356,7 @@ class A {
 ''');
 
     _assertSelectionState(selectionState, r'''
-element: self::@fragment::self::@class::A::@constructor::new
+element: self::@class::A::@constructor::new
 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 = 469;
+  static const int DATA_VERSION = 470;
 
   /// 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

@@ -628,23 +628,23 @@ class ClassFragmentImpl extends ClassOrMixinFragmentImpl
     _constructors = constructorsToForward
         .map((superclassConstructor) {
           var name = superclassConstructor.name2;
-          var implicitConstructor = ConstructorFragmentImpl(
+          var implicitConstructorFragment = ConstructorFragmentImpl(
             name2: name,
             nameOffset: -1,
           );
-          implicitConstructor.isSynthetic = true;
-          implicitConstructor.typeName = name2;
+          implicitConstructorFragment.isSynthetic = true;
+          implicitConstructorFragment.typeName = name2;
 
           var containerRef = reference!.getChild('@constructor');
           var referenceName = name.ifNotEmptyOrElse('new');
           var implicitReference = containerRef.getChild(referenceName);
-          implicitConstructor.reference = implicitReference;
-          implicitReference.element = implicitConstructor;
+          implicitConstructorFragment.reference = implicitReference;
+          implicitReference.element = implicitConstructorFragment;
 
           var hasMixinWithInstanceVariables = mixins.any(
             typeHasInstanceVariables,
           );
-          implicitConstructor.isConst =
+          implicitConstructorFragment.isConst =
               superclassConstructor.isConst && !hasMixinWithInstanceVariables;
           var superParameters = superclassConstructor.parameters;
           int count = superParameters.length;
@@ -696,11 +696,12 @@ class ClassFragmentImpl extends ClassOrMixinFragmentImpl
                   ..setPseudoExpressionStaticType(implicitParameter.type),
               );
             }
-            implicitConstructor.parameters = implicitParameters.toFixedList();
+            implicitConstructorFragment.parameters =
+                implicitParameters.toFixedList();
           }
-          implicitConstructor.enclosingElement3 = this;
+          implicitConstructorFragment.enclosingElement3 = this;
           // TODO(scheglov): Why do we manually map parameters types above?
-          implicitConstructor.superConstructor = ConstructorMember.from(
+          implicitConstructorFragment.superConstructor = ConstructorMember.from(
             superclassConstructor,
             superType,
           );
@@ -727,9 +728,17 @@ class ClassFragmentImpl extends ClassOrMixinFragmentImpl
           );
           AstNodeImpl.linkNodeTokens(superInvocation);
           superInvocation.element = superclassConstructor.asElement2;
-          implicitConstructor.constantInitializers = [superInvocation];
+          implicitConstructorFragment.constantInitializers = [superInvocation];
+
+          ConstructorElementImpl2(
+            name3: implicitConstructorFragment.name2,
+            reference: element.reference
+                .getChild('@constructor')
+                .getChild(name),
+            firstFragment: implicitConstructorFragment,
+          );
 
-          return implicitConstructor;
+          return implicitConstructorFragment;
         })
         .toList(growable: false);
   }
@@ -814,13 +823,23 @@ class ConstructorElementImpl2 extends ExecutableElementImpl2
         ConstructorElementMixin2,
         _HasSinceSdkVersionMixin
     implements ConstructorElement {
+  @override
+  final Reference reference;
+
   @override
   final String? name3;
 
   @override
   final ConstructorFragmentImpl firstFragment;
 
-  ConstructorElementImpl2(this.name3, this.firstFragment);
+  ConstructorElementImpl2({
+    required this.name3,
+    required this.reference,
+    required this.firstFragment,
+  }) {
+    reference.element2 = this;
+    firstFragment.element = this;
+  }
 
   @override
   ConstructorElementImpl2 get baseElement => this;
@@ -992,10 +1011,7 @@ mixin ConstructorElementMixin2
 class ConstructorFragmentImpl extends ExecutableFragmentImpl
     with ConstructorElementMixin
     implements ConstructorFragment {
-  late final ConstructorElementImpl2 element = ConstructorElementImpl2(
-    name2,
-    this,
-  );
+  late final ConstructorElementImpl2 element;
 
   /// The super-constructor which this constructor is invoking, or `null` if
   /// this constructor is not generative, or is redirecting, or the

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

@@ -758,6 +758,7 @@ class LibraryReader {
     return _reader.readTypedList(() {
       var resolutionOffset = _baseResolutionOffset + _reader.readUInt30();
       var reference = _readReference();
+      var reference2 = _readReference();
       var typeName = _reader.readOptionalStringReference();
       var fragmentName = _reader.readStringReference();
       var element = ConstructorFragmentImpl(
@@ -774,6 +775,13 @@ class LibraryReader {
       element.setLinkedData(reference, linkedData);
       ConstructorElementFlags.read(_reader, element);
       element.parameters = _readParameters();
+
+      ConstructorElementImpl2(
+        name3: element.name2,
+        reference: reference2,
+        firstFragment: element,
+      );
+
       return element;
     });
   }

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

@@ -160,6 +160,7 @@ class BundleWriter {
   void _writeConstructorElement(ConstructorFragmentImpl element) {
     _sink.writeUInt30(_resolutionSink.offset);
     _writeReference(element);
+    _writeReference2(element.element.reference);
     _sink._writeOptionalStringReference(element.typeName);
     _sink._writeStringReference(element.name2);
     ConstructorElementFlags.write(_sink, element);
@@ -712,7 +713,6 @@ class ResolutionSink extends _SummaryDataWriter {
         );
         _writeTypeList(typeArguments);
       // TODO(scheglov): give reference to each element below
-      case ConstructorElementImpl2():
       case FieldElementImpl2():
       case FormalParameterElementImpl():
       case GetterElementImpl():

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

@@ -270,34 +270,46 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       fragmentName = 'new';
     }
 
-    var element = ConstructorFragmentImpl(
+    var fragment = ConstructorFragmentImpl(
       name2: fragmentName,
       nameOffset: nameOffset,
     );
-    element.isAugmentation = node.augmentKeyword != null;
-    element.isConst = node.constKeyword != null;
-    element.isExternal = node.externalKeyword != null;
-    element.isFactory = node.factoryKeyword != null;
-    element.metadata = _buildMetadata(node.metadata);
-    element.typeName = node.returnType.name;
-    element.typeNameOffset = node.returnType.offset;
-    element.periodOffset = node.period?.offset;
-    element.nameEnd = nameNode.end;
-    element.nameOffset2 = fragmentNameOffset;
-    _setCodeRange(element, node);
-    _setDocumentation(element, node);
-
-    if (element.isConst || element.isFactory) {
-      element.constantInitializers = node.initializers;
+    fragment.isAugmentation = node.augmentKeyword != null;
+    fragment.isConst = node.constKeyword != null;
+    fragment.isExternal = node.externalKeyword != null;
+    fragment.isFactory = node.factoryKeyword != null;
+    fragment.metadata = _buildMetadata(node.metadata);
+    fragment.typeName = node.returnType.name;
+    fragment.typeNameOffset = node.returnType.offset;
+    fragment.periodOffset = node.period?.offset;
+    fragment.nameEnd = nameNode.end;
+    fragment.nameOffset2 = fragmentNameOffset;
+    _setCodeRange(fragment, node);
+    _setDocumentation(fragment, node);
+
+    if (fragment.isConst || fragment.isFactory) {
+      fragment.constantInitializers = node.initializers;
     }
 
-    node.declaredFragment = element;
-    _linker.elementNodes[element] = node;
+    node.declaredFragment = fragment;
+    _linker.elementNodes[fragment] = node;
+
+    var reference = _enclosingContext.addConstructor(fragment);
+
+    var containerBuilder = _enclosingContext.instanceElementBuilder!;
+    var containerElement = containerBuilder.element;
+    var containerRef = containerElement.reference!.getChild('@constructor');
+    var elementReference = containerRef.addChild(fragment.name2);
+
+    ConstructorElementImpl2(
+      name3: fragment.name2,
+      reference: elementReference,
+      firstFragment: fragment,
+    );
 
-    var reference = _enclosingContext.addConstructor(element);
     _buildExecutableElementChildren(
       reference: reference,
-      fragment: element,
+      fragment: fragment,
       formalParameters: node.parameters,
     );
   }
@@ -1858,6 +1870,19 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       representation.constructorFragment = constructorFragment;
       _linker.elementNodes[constructorFragment] = representation;
       _enclosingContext.addConstructor(constructorFragment);
+
+      var containerBuilder = _enclosingContext.instanceElementBuilder!;
+      var containerElement = containerBuilder.element;
+      var containerRef = containerElement.reference!.getChild('@method');
+      var elementReference = containerRef.addChild(
+        extensionFragment.name2 ?? 'new',
+      );
+
+      ConstructorElementImpl2(
+        name3: constructorFragment.name2,
+        reference: elementReference,
+        firstFragment: constructorFragment,
+      );
     }
 
     representation.fieldType.accept(this);

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

@@ -143,15 +143,23 @@ class LibraryBuilder {
       if (classFragment.isMixinApplication) continue;
       if (classFragment.constructors.isNotEmpty) continue;
 
-      var constructor = ConstructorFragmentImpl(name2: 'new', nameOffset: -1)
+      var fragment = ConstructorFragmentImpl(name2: 'new', nameOffset: -1)
         ..isSynthetic = true;
       var containerRef = classFragment.reference!.getChild('@constructor');
       var reference = containerRef.getChild('new');
-      reference.element = constructor;
-      constructor.reference = reference;
-      constructor.typeName = classFragment.name2;
+      reference.element = fragment;
+      fragment.reference = reference;
+      fragment.typeName = classFragment.name2;
+
+      ConstructorElementImpl2(
+        name3: fragment.name2,
+        reference: classFragment.element.reference
+            .getChild('@constructor')
+            .addChild('new'),
+        firstFragment: fragment,
+      );
 
-      classFragment.constructors = [constructor].toFixedList();
+      classFragment.constructors = [fragment].toFixedList();
     }
   }
 
@@ -208,18 +216,26 @@ class LibraryBuilder {
       if (enumFragment is! EnumFragmentImpl) continue;
       if (hasConstructor(enumFragment)) continue;
 
-      var constructor =
+      var fragment =
           ConstructorFragmentImpl(name2: 'new', nameOffset: -1)
             ..isConst = true
             ..isSynthetic = true;
       var containerRef = enumFragment.reference!.getChild('@constructor');
       var reference = containerRef.getChild('new');
-      reference.element = constructor;
-      constructor.reference = reference;
-      constructor.typeName = enumFragment.name2;
+      reference.element = fragment;
+      fragment.reference = reference;
+      fragment.typeName = enumFragment.name2;
+
+      ConstructorElementImpl2(
+        name3: fragment.name2,
+        reference: enumFragment.element.reference
+            .getChild('@constructor')
+            .addChild('new'),
+        firstFragment: fragment,
+      );
 
       enumFragment.constructors =
-          [...enumFragment.constructors, constructor].toFixedList();
+          [...enumFragment.constructors, fragment].toFixedList();
     }
   }
 
@@ -302,7 +318,8 @@ class LibraryBuilder {
       for (var constructor in interfaceFragment.constructors) {
         for (var parameter in constructor.parameters) {
           if (parameter is FieldFormalParameterFragmentImpl) {
-            parameter.field = element.getField(parameter.name2 ?? '')?.asElement;
+            parameter.field =
+                element.getField(parameter.name2 ?? '')?.asElement;
           }
         }
       }