Elements. Store name2 in MethodFragment and similar.

Note that for setters we store the name without '='.
We don't use it yet, so this does not affect anything yet.

Note that for synthetic getter/setter fragments the name is `null`.
But we should not create such fragments at all.
Synthetic getter/setter elements are fine, but they should not have fragments.

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

Author: scheglov

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

@@ -967,6 +967,10 @@ abstract class Fragment {
   /// Returns `null` if the fragment is an unnamed [ConstructorFragment],
   /// even if its [ConstructorElement2] has the name `new`.
   ///
+  /// Returns `null` if the fragment is a synthetic [GetterFragment],
+  /// even if its [GetterElement] has the name `new`.
+  // TODO(scheglov): we should not create such fragments at all.
+  ///
   /// Returns `null` if the fragment declaration node does not have the name
   /// specified, and the parser inserted a synthetic identifier.
   FragmentName? get name2;

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 = 394;
+  static const int DATA_VERSION = 395;
 
   /// 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

@@ -3583,21 +3583,6 @@ abstract class ExecutableElementImpl extends _ExistingElementImpl
     return super.name!;
   }
 
-  @override
-  FragmentName? get name2 {
-    var name = this.name;
-
-    // If synthetic name.
-    if (name.isEmpty) {
-      return null;
-    }
-
-    return FragmentNameImpl(
-      name: name,
-      nameOffset: nameOffset,
-    );
-  }
-
   @override
   List<ParameterElement> get parameters {
     linkedData?.read(this);
@@ -4766,6 +4751,9 @@ class FunctionElementImpl extends ExecutableElementImpl
         FunctionElement,
         FunctionTypedElementImpl,
         TopLevelFunctionFragment {
+  @override
+  FragmentNameImpl? name2;
+
   late final LocalFunctionElementImpl element2 = LocalFunctionElementImpl(this);
 
   /// The element corresponding to this fragment.
@@ -7895,6 +7883,9 @@ final class MetadataImpl implements Metadata {
 class MethodElementImpl extends ExecutableElementImpl
     with AugmentableElement<MethodElementImpl>
     implements MethodElement, MethodFragment {
+  @override
+  FragmentNameImpl? name2;
+
   /// Is `true` if this method is `operator==`, and there is no explicit
   /// type specified for its formal parameter, in this method or in any
   /// overridden methods other than the one declared in `Object`.
@@ -9386,6 +9377,9 @@ abstract class PromotableElementImpl2 extends VariableElementImpl2
 class PropertyAccessorElementImpl extends ExecutableElementImpl
     with AugmentableElement<PropertyAccessorElementImpl>
     implements PropertyAccessorElement, GetterFragment, SetterFragment {
+  @override
+  FragmentNameImpl? name2;
+
   PropertyInducingElementImpl? _variable;
 
   /// The element corresponding to this fragment.

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

@@ -1216,9 +1216,11 @@ class LibraryReader {
     unitElement.functions = _reader.readTypedList(() {
       var resolutionOffset = _baseResolutionOffset + _reader.readUInt30();
       var reference = _readReference();
+      var fragmentName = _readFragmentName();
       var name = reference.elementName;
 
       var element = FunctionElementImpl(name, -1);
+      element.name2 = fragmentName;
 
       var linkedData = FunctionElementLinkedData(
         reference: reference,
@@ -1366,8 +1368,10 @@ class LibraryReader {
     return _reader.readTypedList(() {
       var resolutionOffset = _baseResolutionOffset + _reader.readUInt30();
       var reference = _readReference();
+      var fragmentName = _readFragmentName();
       var name = reference.elementName;
       var element = MethodElementImpl(name, -1);
+      element.name2 = fragmentName;
       var linkedData = MethodElementLinkedData(
         reference: reference,
         libraryReader: this,
@@ -1564,9 +1568,11 @@ class LibraryReader {
     var resolutionOffset = _baseResolutionOffset + _reader.readUInt30();
 
     var reference = _readReference();
+    var fragmentName = _readFragmentName();
     var name = reference.elementName;
 
     var element = PropertyAccessorElementImpl(name, -1);
+    element.name2 = fragmentName;
     PropertyAccessorElementFlags.read(_reader, element);
 
     var linkedData = PropertyAccessorElementLinkedData(

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

@@ -448,6 +448,7 @@ class BundleWriter {
   void _writeFunctionElement(FunctionElementImpl element) {
     _sink.writeUInt30(_resolutionSink.offset);
     _writeReference(element);
+    _writeFragmentName(element.name2);
     FunctionElementFlags.write(_sink, element);
 
     _resolutionSink._writeAnnotationList(element.metadata);
@@ -520,6 +521,7 @@ class BundleWriter {
   void _writeMethodElement(MethodElementImpl element) {
     _sink.writeUInt30(_resolutionSink.offset);
     _writeReference(element);
+    _writeFragmentName(element.name2);
     MethodElementFlags.write(_sink, element);
 
     _resolutionSink._writeAnnotationList(element.metadata);
@@ -650,6 +652,7 @@ class BundleWriter {
   void _writePropertyAccessorElement(PropertyAccessorElementImpl element) {
     _sink.writeUInt30(_resolutionSink.offset);
     _writeReference(element);
+    _writeFragmentName(element.name2);
     PropertyAccessorElementFlags.write(_sink, element);
 
     _resolutionSink._writeAnnotationList(element.metadata);

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

@@ -737,6 +737,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
     var nameToken = node.name;
     var name = nameToken.lexeme;
     var nameOffset = nameToken.offset;
+    var fragmentName = _buildFragmentName(nameToken);
 
     var functionExpression = node.functionExpression;
     var body = functionExpression.body;
@@ -745,6 +746,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
     ExecutableElementImpl executableElement;
     if (node.isGetter) {
       var element = PropertyAccessorElementImpl(name, nameOffset);
+      element.name2 = fragmentName;
       element.isAugmentation = node.augmentKeyword != null;
       element.isGetter = true;
       element.isStatic = true;
@@ -759,6 +761,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       _libraryBuilder.topVariables.addAccessor(element);
     } else if (node.isSetter) {
       var element = PropertyAccessorElementImpl(name, nameOffset);
+      element.name2 = fragmentName;
       element.isAugmentation = node.augmentKeyword != null;
       element.isSetter = true;
       element.isStatic = true;
@@ -773,6 +776,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       _libraryBuilder.topVariables.addAccessor(element);
     } else {
       var element = FunctionElementImpl(name, nameOffset);
+      element.name2 = fragmentName;
       element.isAugmentation = node.augmentKeyword != null;
       element.isStatic = true;
       reference = _enclosingContext.addFunction(name, element);
@@ -975,11 +979,13 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
     var nameToken = node.name;
     var name = nameToken.lexeme;
     var nameOffset = nameToken.offset;
+    var fragmentName = _buildFragmentName(nameToken);
 
     Reference reference;
     ExecutableElementImpl executableElement;
     if (node.isGetter) {
       var element = PropertyAccessorElementImpl(name, nameOffset);
+      element.name2 = fragmentName;
       element.isAbstract = node.isAbstract;
       element.isAugmentation = node.augmentKeyword != null;
       element.isGetter = true;
@@ -999,6 +1005,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       _buildSyntheticVariable(name: name, accessorElement: element);
     } else if (node.isSetter) {
       var element = PropertyAccessorElementImpl(name, nameOffset);
+      element.name2 = fragmentName;
       element.isAbstract = node.isAbstract;
       element.isAugmentation = node.augmentKeyword != null;
       element.isSetter = true;
@@ -1017,6 +1024,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       }
 
       var element = MethodElementImpl(name, nameOffset);
+      element.name2 = fragmentName;
       element.isAbstract = node.isAbstract;
       element.isAugmentation = node.augmentKeyword != null;
       element.isStatic = node.isStatic;

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

@@ -186,6 +186,7 @@ class InformativeDataApplier {
         element as PropertyAccessorElementImpl;
         element.setCodeRange(info.codeOffset, info.codeLength);
         element.nameOffset = info.nameOffset;
+        _setFragmentNameOffset(element.name2, info.nameOffset2);
         element.documentationComment = info.documentationComment;
         _applyToFormalParameters(
           element.parameters_unresolved,
@@ -572,6 +573,7 @@ class InformativeDataApplier {
     element as FunctionElementImpl;
     element.setCodeRange(info.codeOffset, info.codeLength);
     element.nameOffset = info.nameOffset;
+    _setFragmentNameOffset(element.name2, info.nameOffset2);
     element.documentationComment = info.documentationComment;
     _applyToTypeParameters(
       element.typeParameters_unresolved,
@@ -698,6 +700,7 @@ class InformativeDataApplier {
         element as MethodElementImpl;
         element.setCodeRange(info.codeOffset, info.codeLength);
         element.nameOffset = info.nameOffset;
+        _setFragmentNameOffset(element.name2, info.nameOffset2);
         element.documentationComment = info.documentationComment;
         _applyToTypeParameters(
           element.typeParameters_unresolved,
@@ -1219,6 +1222,7 @@ class _InfoFunctionDeclaration {
   final int codeOffset;
   final int codeLength;
   final int nameOffset;
+  final int? nameOffset2;
   final String? documentationComment;
   final List<_InfoTypeParameter> typeParameters;
   final List<_InfoFormalParameter> parameters;
@@ -1229,6 +1233,7 @@ class _InfoFunctionDeclaration {
       codeOffset: reader.readUInt30(),
       codeLength: reader.readUInt30(),
       nameOffset: reader.readUInt30(),
+      nameOffset2: reader.readOptionalUInt30(),
       documentationComment: reader.readStringUtf8().nullIfEmpty,
       typeParameters: reader.readTypedList(
         () => _InfoTypeParameter(reader),
@@ -1244,6 +1249,7 @@ class _InfoFunctionDeclaration {
     required this.codeOffset,
     required this.codeLength,
     required this.nameOffset,
+    required this.nameOffset2,
     required this.documentationComment,
     required this.typeParameters,
     required this.parameters,
@@ -1371,6 +1377,7 @@ class _InfoMethodDeclaration {
   final int codeOffset;
   final int codeLength;
   final int nameOffset;
+  final int? nameOffset2;
   final String? documentationComment;
   final List<_InfoTypeParameter> typeParameters;
   final List<_InfoFormalParameter> parameters;
@@ -1381,6 +1388,7 @@ class _InfoMethodDeclaration {
       codeOffset: reader.readUInt30(),
       codeLength: reader.readUInt30(),
       nameOffset: reader.readUInt30(),
+      nameOffset2: reader.readOptionalUInt30(),
       documentationComment: reader.readStringUtf8().nullIfEmpty,
       typeParameters: reader.readTypedList(
         () => _InfoTypeParameter(reader),
@@ -1396,6 +1404,7 @@ class _InfoMethodDeclaration {
     required this.codeOffset,
     required this.codeLength,
     required this.nameOffset,
+    required this.nameOffset2,
     required this.documentationComment,
     required this.typeParameters,
     required this.parameters,
@@ -1540,6 +1549,7 @@ class _InformativeDataWriter {
         sink.writeUInt30(node.offset);
         sink.writeUInt30(node.length);
         sink.writeUInt30(node.name.offset);
+        sink.writeOptionalUInt30(node.name.offsetIfNotEmpty);
         _writeDocumentationComment(node);
         _writeTypeParameters(node.functionExpression.typeParameters);
         _writeFormalParameters(node.functionExpression.parameters);
@@ -1559,6 +1569,7 @@ class _InformativeDataWriter {
       sink.writeUInt30(node.offset);
       sink.writeUInt30(node.length);
       sink.writeUInt30(node.name.offset);
+      sink.writeOptionalUInt30(node.name.offsetIfNotEmpty);
       _writeDocumentationComment(node);
       _writeTypeParameters(node.functionExpression.typeParameters);
       _writeFormalParameters(node.functionExpression.parameters);
@@ -1771,6 +1782,7 @@ class _InformativeDataWriter {
         sink.writeUInt30(node.offset);
         sink.writeUInt30(node.length);
         sink.writeUInt30(node.name.offset);
+        sink.writeOptionalUInt30(node.name.offsetIfNotEmpty);
         _writeDocumentationComment(node);
         _writeTypeParameters(node.typeParameters);
         _writeFormalParameters(node.parameters);
@@ -1818,6 +1830,7 @@ class _InformativeDataWriter {
         sink.writeUInt30(node.offset);
         sink.writeUInt30(node.length);
         sink.writeUInt30(node.name.offset);
+        sink.writeOptionalUInt30(node.name.offsetIfNotEmpty);
         _writeDocumentationComment(node);
         _writeTypeParameters(node.typeParameters);
         _writeFormalParameters(node.parameters);