Elements. Store name2 for formal parameter fragments.

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

Author: scheglov

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

@@ -866,10 +866,6 @@ 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 = 395;
+  static const int DATA_VERSION = 396;
 
   /// 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

@@ -8630,6 +8630,9 @@ class NotAugmentedMixinElementImpl extends NotAugmentedInterfaceElementImpl
 class ParameterElementImpl extends VariableElementImpl
     with ParameterElementMixin
     implements ParameterElement, FormalParameterFragment {
+  @override
+  FragmentNameImpl? name2;
+
   /// A list containing all of the parameters defined by this parameter element.
   /// There will only be parameters if this parameter is a function typed
   /// parameter.
@@ -8748,19 +8751,6 @@ class ParameterElementImpl extends VariableElementImpl
   LibraryFragment get libraryFragment =>
       thisOrAncestorOfType<CompilationUnitElementImpl>() as LibraryFragment;
 
-  @override
-  FragmentName? get name2 {
-    var name = this.name;
-    if (name.isEmpty) {
-      return null;
-    }
-
-    return FragmentNameImpl(
-      name: name,
-      nameOffset: nameOffset,
-    );
-  }
-
   @override
   // TODO(augmentations): Support chaining between the fragments.
   FormalParameterFragment? get nextFragment => null;

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

@@ -1459,6 +1459,7 @@ class LibraryReader {
   // TODO(scheglov): Deduplicate parameter reading implementation.
   List<ParameterElementImpl> _readParameters() {
     return _reader.readTypedList(() {
+      var fragmentName = _readFragmentName();
       var name = _reader.readStringReference();
       var isDefault = _reader.readBool();
       var isInitializingFormal = _reader.readBool();
@@ -1514,6 +1515,7 @@ class LibraryReader {
           reference.element = element;
         }
       }
+      element.name2 = fragmentName;
       ParameterElementFlags.read(_reader, element);
       element.typeParameters = _readTypeParameters();
       element.parameters = _readParameters();

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

@@ -602,6 +602,7 @@ class BundleWriter {
   // TODO(scheglov): Deduplicate parameter writing implementation.
   void _writeParameterElement(ParameterElement element) {
     element as ParameterElementImpl;
+    _writeFragmentName(element.name2);
     _sink._writeStringReference(element.name);
     _sink.writeBool(element is ConstVariableElement);
     _sink.writeBool(element.isInitializingFormal);

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

@@ -680,6 +680,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
     var nameToken = node.name;
     var name = nameToken.lexeme;
     var nameOffset = nameToken.offset;
+    var fragmentName = _buildFragmentName(nameToken);
 
     ParameterElementImpl element;
     var parent = node.parent;
@@ -701,6 +702,8 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       _linker.elementNodes[element] = node;
       _enclosingContext.addParameter(null, element);
     }
+
+    element.name2 = fragmentName;
     element.hasImplicitType = node.type == null && node.parameters == null;
     element.metadata = _buildAnnotations(node.metadata);
     _setCodeRange(element, node);
@@ -852,6 +855,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
     var nameToken = node.name;
     var name = nameToken.lexeme;
     var nameOffset = nameToken.offset;
+    var fragmentName = _buildFragmentName(nameToken);
 
     ParameterElementImpl element;
     var parent = node.parent;
@@ -870,6 +874,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       );
       _linker.elementNodes[element] = node;
     }
+    element.name2 = fragmentName;
     element.isExplicitlyCovariant = node.covariantKeyword != null;
     element.isFinal = node.isFinal;
     element.metadata = _buildAnnotations(node.metadata);
@@ -1165,6 +1170,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
     var nameToken = node.name;
     var name = nameToken?.lexeme ?? '';
     var nameOffset = nameToken?.offset ?? -1;
+    var fragmentName = _buildFragmentName(nameToken);
 
     ParameterElementImpl element;
     var parent = node.parent;
@@ -1188,6 +1194,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       _enclosingContext.addParameter(null, element);
     }
 
+    element.name2 = fragmentName;
     element.hasImplicitType = node.type == null;
     element.isExplicitlyCovariant = node.covariantKeyword != null;
     element.isFinal = node.isFinal;
@@ -1206,6 +1213,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
     var nameToken = node.name;
     var name = nameToken.lexeme;
     var nameOffset = nameToken.offset;
+    var fragmentName = _buildFragmentName(nameToken);
 
     SuperFormalParameterElementImpl element;
     var parent = node.parent;
@@ -1227,6 +1235,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       _linker.elementNodes[element] = node;
       _enclosingContext.addParameter(null, element);
     }
+    element.name2 = fragmentName;
     element.hasImplicitType = node.type == null && node.parameters == null;
     element.metadata = _buildAnnotations(node.metadata);
     _setCodeRange(element, node);
@@ -1516,6 +1525,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
     )
       ..field = fieldElement
       ..hasImplicitType = true;
+    formalParameterElement.name2 = _buildFragmentName(fieldNameToken);
     formalParameterElement.setCodeRange(
       fieldCodeRangeOffset,
       fieldCodeRangeLength,

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

@@ -484,6 +484,10 @@ class InformativeDataApplier {
       var primaryConstructorParameter = primaryConstructor
           .parameters_unresolved.first as ParameterElementImpl;
       primaryConstructorParameter.nameOffset = infoRep.fieldNameOffset;
+      _setFragmentNameOffset(
+        primaryConstructorParameter.name2,
+        infoRep.fieldNameOffset,
+      );
       primaryConstructorParameter.setCodeRange(
         infoRep.fieldCodeOffset,
         infoRep.fieldCodeLength,
@@ -560,6 +564,7 @@ class InformativeDataApplier {
         element as ParameterElementImpl;
         element.setCodeRange(info.codeOffset, info.codeLength);
         element.nameOffset = info.nameOffset;
+        _setFragmentNameOffset(element.name2, info.nameOffset2);
         _applyToTypeParameters(element.typeParameters, info.typeParameters);
         _applyToFormalParameters(element.parameters, info.parameters);
       },
@@ -1192,6 +1197,7 @@ class _InfoFormalParameter {
   final int codeOffset;
   final int codeLength;
   final int nameOffset;
+  final int? nameOffset2;
   final List<_InfoTypeParameter> typeParameters;
   final List<_InfoFormalParameter> parameters;
 
@@ -1200,6 +1206,7 @@ class _InfoFormalParameter {
       codeOffset: reader.readUInt30(),
       codeLength: reader.readUInt30(),
       nameOffset: reader.readUInt30() - 1,
+      nameOffset2: reader.readOptionalUInt30(),
       typeParameters: reader.readTypedList(
         () => _InfoTypeParameter(reader),
       ),
@@ -1213,6 +1220,7 @@ class _InfoFormalParameter {
     required this.codeOffset,
     required this.codeLength,
     required this.nameOffset,
+    required this.nameOffset2,
     required this.typeParameters,
     required this.parameters,
   });
@@ -1754,7 +1762,7 @@ class _InformativeDataWriter {
       sink.writeUInt30(node.offset);
       sink.writeUInt30(node.length);
       sink.writeUInt30(1 + (node.name?.offset ?? -1));
-
+      sink.writeOptionalUInt30(node.name?.offsetIfNotEmpty);
       var notDefault = node.notDefault;
       if (notDefault is FieldFormalParameter) {
         _writeTypeParameters(notDefault.typeParameters);