Elements. Add ConstructorFragment.typeName and typeNameOffset.

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

Author: scheglov

pkg/analyzer/lib/dart/element/element2.dart

@@ -320,6 +320,21 @@ abstract class ConstructorFragment implements ExecutableFragment {
 
   @override
   ConstructorFragment? get previousFragment;
+
+  /// The specified name of the type (e.g. class).
+  ///
+  /// In valid code it is the name of the [enclosingFragment], however it
+  /// could be anything in invalid code, e.g. `class A { A2.named(); }`.
+  ///
+  /// If the fragment is synthetic, the type name is the name of the
+  /// enclosing type, which itself can be `null` if its name token is
+  /// synthetic.
+  String? get typeName;
+
+  /// The offset of the type (e.g. class) name.
+  ///
+  /// It is `null` if the fragment is synthetic.
+  int? get typeNameOffset;
 }
 
 /// The base class for all of the elements in the element model.

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

@@ -99,7 +99,7 @@ import 'package:meta/meta.dart';
 // 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 = 414;
+  static const int DATA_VERSION = 416;
 
   /// 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

@@ -534,6 +534,7 @@ class ClassElementImpl extends ClassOrMixinElementImpl
       var name = superclassConstructor.name;
       var implicitConstructor = ConstructorElementImpl(name, -1);
       implicitConstructor.isSynthetic = true;
+      implicitConstructor.typeName = name2;
       implicitConstructor.name = name;
       implicitConstructor.nameOffset = -1;
       implicitConstructor.name2 = superclassConstructor.name2;
@@ -1321,6 +1322,12 @@ class ConstructorElementImpl extends ExecutableElementImpl
   /// instance creation expressions).
   List<ConstructorInitializer> _constantInitializers = const [];
 
+  @override
+  String? typeName;
+
+  @override
+  int? typeNameOffset;
+
   @override
   int? periodOffset;
 

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

@@ -781,6 +781,7 @@ class LibraryReader {
       var reference = _readReference();
       var name = reference.elementName.ifEqualThen('new', '');
       var element = ConstructorElementImpl(name, -1);
+      element.typeName = _reader.readOptionalStringReference();
       element.name2 = _reader.readStringReference();
       var linkedData = ConstructorElementLinkedData(
         reference: reference,

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

@@ -185,6 +185,7 @@ class BundleWriter {
   void _writeConstructorElement(ConstructorElementImpl element) {
     _sink.writeUInt30(_resolutionSink.offset);
     _writeReference(element);
+    _sink._writeOptionalStringReference(element.typeName);
     _sink._writeStringReference(element.name2);
     ConstructorElementFlags.write(_sink, element);
     _writeAugmentationTargetAny(element);

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

@@ -227,6 +227,8 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
     element.isExternal = node.externalKeyword != null;
     element.isFactory = node.factoryKeyword != null;
     element.metadata = _buildAnnotations(node.metadata);
+    element.typeName = node.returnType.name;
+    element.typeNameOffset = node.returnType.offset;
     element.periodOffset = node.period?.offset;
     element.nameEnd = nameNode.end;
     if ((node.period, node.name) case (var _?, var name?)) {
@@ -1687,6 +1689,8 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
         ..periodOffset = periodOffset
         ..nameEnd = nameEnd
         ..parameters = [formalParameterElement];
+      constructorElement.typeName = extensionElement.name2;
+      constructorElement.typeNameOffset = extensionElement.nameOffset2;
       if (representation.constructorName case var constructorName?) {
         constructorElement.name2 = constructorName.name.lexeme;
         constructorElement.nameOffset2 = constructorName.name.offset;

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

@@ -306,6 +306,7 @@ class InformativeDataApplier {
       (element, info) {
         element as ConstructorElementImpl;
         element.setCodeRange(info.codeOffset, info.codeLength);
+        element.typeNameOffset = info.typeNameOffset;
         element.periodOffset = info.periodOffset;
         element.nameOffset = info.nameOffset;
         element.nameEnd = info.nameEnd;
@@ -462,6 +463,7 @@ class InformativeDataApplier {
         infoRep.constructorCodeOffset,
         infoRep.constructorCodeLength,
       );
+      primaryConstructor.typeNameOffset = infoRep.typeNameOffset;
       primaryConstructor.periodOffset = infoRep.constructorPeriodOffset;
       primaryConstructor.nameOffset = infoRep.constructorNameOffset;
       primaryConstructor.nameEnd = infoRep.constructorNameEnd;
@@ -976,6 +978,7 @@ class _InfoCombinator {
 class _InfoConstructorDeclaration {
   final int codeOffset;
   final int codeLength;
+  final int? typeNameOffset;
   final int? periodOffset;
   final int nameOffset;
   final int? nameEnd;
@@ -988,6 +991,7 @@ class _InfoConstructorDeclaration {
     return _InfoConstructorDeclaration._(
       codeOffset: reader.readUInt30(),
       codeLength: reader.readUInt30(),
+      typeNameOffset: reader.readUInt30(),
       periodOffset: reader.readOptionalUInt30(),
       nameOffset: reader.readUInt30(),
       nameEnd: reader.readOptionalUInt30(),
@@ -1003,6 +1007,7 @@ class _InfoConstructorDeclaration {
   _InfoConstructorDeclaration._({
     required this.codeOffset,
     required this.codeLength,
+    required this.typeNameOffset,
     required this.periodOffset,
     required this.nameOffset,
     required this.nameEnd,
@@ -1092,6 +1097,7 @@ class _InfoExtensionTypeDeclaration {
 class _InfoExtensionTypeRepresentation {
   final int constructorCodeOffset;
   final int constructorCodeLength;
+  final int? typeNameOffset;
   final int? constructorPeriodOffset;
   final int constructorNameOffset;
   final int? constructorNameEnd;
@@ -1106,6 +1112,7 @@ class _InfoExtensionTypeRepresentation {
     return _InfoExtensionTypeRepresentation._(
       constructorCodeOffset: reader.readUInt30(),
       constructorCodeLength: reader.readUInt30(),
+      typeNameOffset: reader.readOptionalUInt30(),
       constructorPeriodOffset: reader.readOptionalUInt30(),
       constructorNameOffset: reader.readUInt30(),
       constructorNameEnd: reader.readOptionalUInt30(),
@@ -1121,6 +1128,7 @@ class _InfoExtensionTypeRepresentation {
   _InfoExtensionTypeRepresentation._({
     required this.constructorCodeOffset,
     required this.constructorCodeLength,
+    required this.typeNameOffset,
     required this.constructorPeriodOffset,
     required this.constructorNameOffset,
     required this.constructorNameEnd,
@@ -1650,6 +1658,7 @@ class _InformativeDataWriter {
     sink.writeList2<ConstructorDeclaration>(members, (node) {
       sink.writeUInt30(node.offset);
       sink.writeUInt30(node.length);
+      sink.writeUInt30(node.returnType.offset);
       sink.writeOptionalUInt30(node.period?.offset);
       var nameNode = node.name ?? node.returnType;
       sink.writeUInt30(nameNode.offset);
@@ -1903,9 +1912,10 @@ class _InformativeDataWriter {
     // Constructor code range.
     sink.writeUInt30(node.offset);
     sink.writeUInt30(node.length);
+    sink.writeOptionalUInt30(declaration.name.offsetIfNotEmpty);
 
     var constructorName = node.constructorName;
-      if (constructorName != null) {
+    if (constructorName != null) {
       sink.writeOptionalUInt30(constructorName.period.offset);
       sink.writeUInt30(constructorName.name.offset);
       sink.writeOptionalUInt30(constructorName.name.end);

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

@@ -180,6 +180,7 @@ class LibraryBuilder with MacroApplicationsContainer {
       var reference = containerRef.getChild('new');
       reference.element = constructor;
       constructor.reference = reference;
+      constructor.typeName = classElement.name2;
       constructor.name2 = 'new';
 
       classElement.constructors = [constructor].toFixedList();
@@ -252,6 +253,7 @@ class LibraryBuilder with MacroApplicationsContainer {
       var reference = containerRef.getChild('new');
       reference.element = constructor;
       constructor.reference = reference;
+      constructor.typeName = enumElement.name2;
       constructor.name2 = 'new';
 
       enumElement.constructors = [

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

@@ -356,6 +356,11 @@ class _Element2Writer extends _AbstractElementWriter {
       _writeFragmentCodeRange(f);
       // _writeDisplayName(f);
 
+      _sink.writelnWithIndent('typeName: ${f.typeName}');
+      if (f.typeNameOffset case var typeNameOffset?) {
+        _sink.writelnWithIndent('typeNameOffset: $typeNameOffset');
+      }
+
       if (f.periodOffset case var periodOffset?) {
         _sink.writelnWithIndent('periodOffset: $periodOffset');
       }