Elements. Store name2 in PropertyInducingElementImpl.

Change-Id: Ie56dcc3a9d3d0fd970604e06934ac21e8eccaac6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/390820
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
Reviewed-by: Phil Quitslund <[email protected]>

Author: scheglov

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

@@ -96,7 +96,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 = 396;
+  static const int DATA_VERSION = 397;
 
   /// 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

@@ -9519,6 +9519,9 @@ abstract class PropertyInducingElementImpl
     extends NonParameterVariableElementImpl
     with MacroTargetElement
     implements PropertyInducingElement, PropertyInducingFragment {
+  @override
+  FragmentNameImpl? name2;
+
   /// The getter associated with this element.
   @override
   PropertyAccessorElementImpl? getter;
@@ -9580,21 +9583,6 @@ abstract class PropertyInducingElementImpl
   LibraryFragment get libraryFragment =>
       thisOrAncestorOfType<CompilationUnitElement>() as LibraryFragment;
 
-  @override
-  FragmentName? get name2 {
-    var name = this.name;
-
-    // If synthetic name.
-    if (name.isEmpty) {
-      return null;
-    }
-
-    return FragmentNameImpl(
-      name: name,
-      nameOffset: nameOffset,
-    );
-  }
-
   @override
   PropertyInducingFragment? get nextFragment =>
       augmentation as PropertyInducingFragment?;

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

@@ -1138,8 +1138,10 @@ class LibraryReader {
     var reference = _readReference();
     var getterReference = _readOptionalReference();
     var setterReference = _readOptionalReference();
+    var fragmentName = _readFragmentName();
 
-    var name = reference.elementName;
+    // TODO(scheglov): we do this only because FieldElement2 uses this name.
+    var name = _reader.readStringReference();
     var isConstElement = _reader.readBool();
 
     FieldElementImpl element;
@@ -1148,6 +1150,7 @@ class LibraryReader {
     } else {
       element = FieldElementImpl(name, -1);
     }
+    element.name2 = fragmentName;
 
     var linkedData = FieldElementLinkedData(
       reference: reference,
@@ -1691,8 +1694,10 @@ class LibraryReader {
     var reference = _readReference();
     var getterReference = _readOptionalReference();
     var setterReference = _readOptionalReference();
+    var fragmentName = _readFragmentName();
 
-    var name = reference.elementName;
+    // TODO(scheglov): we do this only because FieldElement2 uses this name.
+    var name = _reader.readStringReference();
     var isConst = _reader.readBool();
 
     TopLevelVariableElementImpl element;
@@ -1701,6 +1706,7 @@ class LibraryReader {
     } else {
       element = TopLevelVariableElementImpl(name, -1);
     }
+    element.name2 = fragmentName;
 
     var linkedData = TopLevelVariableElementLinkedData(
       reference: reference,

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

@@ -407,6 +407,8 @@ class BundleWriter {
     _writeReference(element);
     _writeOptionalReference(element.getter?.reference);
     _writeOptionalReference(element.setter?.reference);
+    _writeFragmentName(element.name2);
+    _sink._writeStringReference(element.name);
     _sink.writeBool(element is ConstFieldElementImpl);
     FieldElementFlags.write(_sink, element);
     _sink._writeTopLevelInferenceError(element.typeInferenceError);
@@ -683,6 +685,8 @@ class BundleWriter {
     _writeReference(element);
     _writeOptionalReference(element.getter?.reference);
     _writeOptionalReference(element.setter?.reference);
+    _writeFragmentName(element.name2);
+    _sink._writeStringReference(element.name);
     _sink.writeBool(element.isConst);
     TopLevelVariableElementFlags.write(_sink, element);
     _sink._writeTopLevelInferenceError(element.typeInferenceError);

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

@@ -288,13 +288,15 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
     for (var i = 0; i < constants.length; ++i) {
       var constant = constants[i];
       var name = constant.name.lexeme;
+      var fragmentName = _buildFragmentName(constant.name);
       var field = ConstFieldElementImpl(name, constant.name.offset)
         ..hasImplicitType = true
         ..hasInitializer = true
         ..isAugmentation = constant.augmentKeyword != null
         ..isConst = true
         ..isEnumConstant = true
         ..isStatic = true;
+      field.name2 = fragmentName;
       _setCodeRange(field, constant);
       _setDocumentation(field, constant);
       field.metadata = _buildAnnotationsWithUnit(
@@ -349,7 +351,10 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       _linker.elementNodes[field] = variableDeclaration;
 
       field.constantInitializer = initializer;
-      holder.addNonSyntheticField(field);
+
+      var refName = fragmentName?.name ?? '${_nextUnnamedId++}';
+      holder.addNonSyntheticField(refName, field);
+
       valuesElements.add(
         SimpleIdentifierImpl(
           StringToken(TokenType.STRING, name, -1),
@@ -405,7 +410,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       );
       _linker.elementNodes[valuesField] = variableDeclaration;
 
-      holder.addNonSyntheticField(valuesField);
+      holder.addNonSyntheticField('values', valuesField);
 
       _libraryBuilder.implicitEnumNodes[element] = ImplicitEnumNodes(
         element: element,
@@ -632,6 +637,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       var nameToken = variable.name;
       var name = nameToken.lexeme;
       var nameOffset = nameToken.offset;
+      var fragmentName = _buildFragmentName(nameToken);
 
       var element = FieldElementImpl(name, nameOffset);
       if (variable.initializer case var initializer?) {
@@ -648,6 +654,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
         }
       }
 
+      element.name2 = fragmentName;
       element.hasInitializer = variable.initializer != null;
       element.isAbstract = node.abstractKeyword != null;
       element.isAugmentation = node.augmentKeyword != null;
@@ -665,7 +672,8 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
         element.hasImplicitType = true;
       }
 
-      _enclosingContext.addNonSyntheticField(element);
+      var refName = fragmentName?.name ?? '${_nextUnnamedId++}';
+      _enclosingContext.addNonSyntheticField(refName, element);
 
       _linker.elementNodes[element] = variable;
       variable.declaredElement = element;
@@ -1273,6 +1281,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       var nameToken = variable.name;
       var name = nameToken.lexeme;
       var nameOffset = nameToken.offset;
+      var fragmentName = _buildFragmentName(nameToken);
 
       TopLevelVariableElementImpl element;
       if (node.variables.isConst) {
@@ -1282,6 +1291,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
         element = TopLevelVariableElementImpl(name, nameOffset);
       }
 
+      element.name2 = fragmentName;
       element.hasInitializer = variable.initializer != null;
       element.isAugmentation = node.augmentKeyword != null;
       element.isConst = node.variables.isConst;
@@ -1296,22 +1306,24 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
         element.hasImplicitType = true;
       }
 
+      var refName = fragmentName?.name ?? '${_nextUnnamedId++}';
+      _enclosingContext.addTopLevelVariable(refName, element);
+
       {
-        var ref = enclosingRef.getChild('@getter').addChild(name);
+        var ref = enclosingRef.getChild('@getter').addChild(refName);
         var getter = element.createImplicitGetter(ref);
         _enclosingContext.addPropertyAccessorSynthetic(getter);
         _libraryBuilder.declare(name, ref);
       }
 
       if (element.hasSetter) {
-        var ref = enclosingRef.getChild('@setter').addChild(name);
+        var ref = enclosingRef.getChild('@setter').addChild(refName);
         var setter = element.createImplicitSetter(ref);
         _enclosingContext.addPropertyAccessorSynthetic(setter);
         _libraryBuilder.declare('$name=', ref);
       }
 
       _linker.elementNodes[element] = variable;
-      _enclosingContext.addTopLevelVariable(name, element);
       variable.declaredElement = element;
 
       _libraryBuilder.topVariables.addVariable(element);
@@ -1500,11 +1512,13 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
 
     var fieldNameToken = representation.fieldName;
     var fieldName = fieldNameToken.lexeme.ifNotEmptyOrElse('<empty>');
+    var fieldFragmentName = _buildFragmentName(fieldNameToken);
 
     var fieldElement = FieldElementImpl(
       fieldName,
       fieldNameToken.offset,
     );
+    fieldElement.name2 = fieldFragmentName;
     fieldElement.isFinal = true;
     fieldElement.metadata = _buildAnnotations(representation.fieldMetadata);
 
@@ -1516,7 +1530,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
 
     representation.fieldElement = fieldElement;
     _linker.elementNodes[fieldElement] = representation;
-    _enclosingContext.addNonSyntheticField(fieldElement);
+    _enclosingContext.addNonSyntheticField(fieldName, fieldElement);
 
     var formalParameterElement = FieldFormalParameterElementImpl(
       name: fieldName,
@@ -1831,8 +1845,7 @@ class _EnclosingContext {
     return _addReference(containerName, name, element);
   }
 
-  void addNonSyntheticField(FieldElementImpl element) {
-    var name = element.name;
+  void addNonSyntheticField(String name, FieldElementImpl element) {
     addField(name, element);
 
     // Augmenting a variable with a variable only alters its initializer.

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

@@ -447,6 +447,10 @@ class InformativeDataApplier {
       var representationField = element.fields.first;
       var infoRep = info.representation;
       representationField.nameOffset = infoRep.fieldNameOffset;
+      _setFragmentNameOffset(
+        representationField.name2,
+        infoRep.fieldNameOffset2,
+      );
       representationField.setCodeRange(
         infoRep.fieldCodeOffset,
         infoRep.fieldCodeLength,
@@ -533,6 +537,7 @@ class InformativeDataApplier {
         element as FieldElementImpl;
         element.setCodeRange(info.codeOffset, info.codeLength);
         element.nameOffset = info.nameOffset;
+        _setFragmentNameOffset(element.name2, info.nameOffset2);
         element.documentationComment = info.documentationComment;
 
         var applyOffsets = ApplyConstantOffsets(
@@ -779,6 +784,7 @@ class InformativeDataApplier {
     element as TopLevelVariableElementImpl;
     element.setCodeRange(info.codeOffset, info.codeLength);
     element.nameOffset = info.nameOffset;
+    _setFragmentNameOffset(element.name2, info.nameOffset2);
     element.documentationComment = info.documentationComment;
 
     var applyOffsets = ApplyConstantOffsets(
@@ -1139,6 +1145,7 @@ class _InfoExtensionTypeRepresentation {
   final int fieldCodeOffset;
   final int fieldCodeLength;
   final int fieldNameOffset;
+  final int? fieldNameOffset2;
   final Uint32List fieldConstantOffsets;
 
   factory _InfoExtensionTypeRepresentation(SummaryDataReader reader) {
@@ -1152,6 +1159,7 @@ class _InfoExtensionTypeRepresentation {
       fieldCodeOffset: reader.readUInt30(),
       fieldCodeLength: reader.readUInt30(),
       fieldNameOffset: reader.readUInt30(),
+      fieldNameOffset2: reader.readOptionalUInt30(),
       fieldConstantOffsets: reader.readUInt30List(),
     );
   }
@@ -1166,6 +1174,7 @@ class _InfoExtensionTypeRepresentation {
     required this.fieldCodeOffset,
     required this.fieldCodeLength,
     required this.fieldNameOffset,
+    required this.fieldNameOffset2,
     required this.fieldConstantOffsets,
   });
 }
@@ -1174,6 +1183,7 @@ class _InfoFieldDeclaration {
   final int codeOffset;
   final int codeLength;
   final int nameOffset;
+  final int? nameOffset2;
   final String? documentationComment;
   final Uint32List constantOffsets;
 
@@ -1182,6 +1192,7 @@ class _InfoFieldDeclaration {
       codeOffset: reader.readUInt30(),
       codeLength: reader.readUInt30(),
       nameOffset: reader.readUInt30(),
+      nameOffset2: reader.readOptionalUInt30(),
       documentationComment: reader.readStringUtf8().nullIfEmpty,
       constantOffsets: reader.readUInt30List(),
     );
@@ -1191,6 +1202,7 @@ class _InfoFieldDeclaration {
     required this.codeOffset,
     required this.codeLength,
     required this.nameOffset,
+    required this.nameOffset2,
     required this.documentationComment,
     required this.constantOffsets,
   });
@@ -1721,6 +1733,7 @@ class _InformativeDataWriter {
       sink.writeUInt30(codeOffset);
       sink.writeUInt30(node.end - codeOffset);
       sink.writeUInt30(node.name.offset);
+      sink.writeOptionalUInt30(node.name.offsetIfNotEmpty);
       _writeDocumentationComment(node);
       _writeOffsets(
         metadata: node.metadata,
@@ -1738,6 +1751,7 @@ class _InformativeDataWriter {
     sink.writeUInt30(codeOffset);
     sink.writeUInt30(node.end - codeOffset);
     sink.writeUInt30(node.name.offset);
+    sink.writeOptionalUInt30(node.name.offsetIfNotEmpty);
     _writeDocumentationComment(node);
 
     // TODO(scheglov): Replace with some kind of double-iterating list.
@@ -1955,6 +1969,7 @@ class _InformativeDataWriter {
     sink.writeUInt30(codeOffset);
     sink.writeUInt30(codeEnd - codeOffset);
     sink.writeUInt30(node.fieldName.offset);
+    sink.writeOptionalUInt30(node.fieldName.offsetIfNotEmpty);
 
     _writeOffsets(
       metadata: node.fieldMetadata,
@@ -1966,6 +1981,7 @@ class _InformativeDataWriter {
     sink.writeUInt30(codeOffset);
     sink.writeUInt30(node.end - codeOffset);
     sink.writeUInt30(node.name.offset);
+    sink.writeOptionalUInt30(node.name.offsetIfNotEmpty);
     _writeDocumentationComment(node);
 
     // TODO(scheglov): Replace with some kind of double-iterating list.
@@ -1991,6 +2007,7 @@ class _InfoTopLevelVariable {
   final int codeOffset;
   final int codeLength;
   final int nameOffset;
+  final int? nameOffset2;
   final String? documentationComment;
   final Uint32List constantOffsets;
 
@@ -1999,6 +2016,7 @@ class _InfoTopLevelVariable {
       codeOffset: reader.readUInt30(),
       codeLength: reader.readUInt30(),
       nameOffset: reader.readUInt30(),
+      nameOffset2: reader.readOptionalUInt30(),
       documentationComment: reader.readStringUtf8().nullIfEmpty,
       constantOffsets: reader.readUInt30List(),
     );
@@ -2008,6 +2026,7 @@ class _InfoTopLevelVariable {
     required this.codeOffset,
     required this.codeLength,
     required this.nameOffset,
+    required this.nameOffset2,
     required this.documentationComment,
     required this.constantOffsets,
   });