Elements. Remove FragmentName, inline as name2 / nameOffset2.

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

Author: scheglov

pkg/analysis_server/lib/src/lsp/handlers/code_lens/abstract_code_lens_provider.dart

@@ -33,7 +33,7 @@ abstract class AbstractCodeLensProvider
   /// If for any reason the location cannot be computed, returns `null`.
   Location? getLocation(Fragment fragment) {
     // We can't produce a location to a name if there isn't one.
-    var nameOffset = fragment.name2?.nameOffset;
+    var nameOffset = fragment.nameOffset2;
     var nameLength = fragment.element.displayName.length;
     if (nameOffset == null) {
       return null;

pkg/analysis_server/lib/src/lsp/handlers/code_lens/augmentations.dart

@@ -72,7 +72,7 @@ class AugmentationCodeLensProvider extends AbstractCodeLensProvider {
     ) {
       var command =
           getNavigationCommand(clientCapabilities, title, targetFragment);
-      var nameOffset = thisFragment.name2?.nameOffset;
+      var nameOffset = thisFragment.nameOffset2;
       var nameLength = thisFragment.element.displayName.length;
       if (command != null && nameOffset != null) {
         var range = toRange(

pkg/analysis_server/lib/src/protocol_server.dart

@@ -268,8 +268,8 @@ Location? newLocation_fromElement2(engine.Element2? element) {
   }
   if (element is engine.FragmentedElement) {
     var fragment = (element as engine.FragmentedElement).firstFragment;
-    var offset = fragment.name2?.nameOffset ?? 0;
-    var length = fragment.name2?.name.length ?? 0;
+    var offset = fragment.nameOffset2 ?? 0;
+    var length = fragment.name2?.length ?? 0;
     var range = engine.SourceRange(offset, length);
     return _locationForArgs2(fragment, range);
   } else {

pkg/analysis_server/lib/src/services/correction/dart/add_field_formal_parameters.dart

@@ -43,8 +43,8 @@ class AddFieldFormalParameters extends ResolvedCorrectionProducer {
     // Compute uninitialized final fields.
     var fields = ErrorVerifier.computeNotInitializedFields2(constructor);
     fields.retainWhere((FieldElement2 field) => field.isFinal);
-    fields.sort((a, b) =>
-        a.firstFragment.name2!.nameOffset - b.firstFragment.name2!.nameOffset);
+    fields.sort(
+        (a, b) => a.firstFragment.nameOffset2! - b.firstFragment.nameOffset2!);
 
     // Specialize for Flutter widgets.
     if (superType.isExactlyStatelessWidgetType ||

pkg/analysis_server/lib/src/services/correction/dart/make_variable_not_final.dart

@@ -45,7 +45,12 @@ class MakeVariableNotFinal extends ResolvedCorrectionProducer {
       return;
     }
 
-    var declaration = NodeLocator(variable.nameOffset).searchWithin(unit);
+    var nameOffset = variable.firstFragment.nameOffset2;
+    if (nameOffset == null) {
+      return;
+    }
+
+    var declaration = NodeLocator(nameOffset).searchWithin(unit);
     var declarationList = declaration?.parent;
 
     if (declaration is VariableDeclaration &&

pkg/analysis_server/lib/src/services/correction/dart/replace_return_type.dart

@@ -105,7 +105,7 @@ class ReplaceReturnType extends ResolvedCorrectionProducer {
     var classElement = clazz.declaredFragment!.element;
     var overriddenList = InheritanceManager3().getOverridden4(
       classElement,
-      Name.forLibrary(classElement.library2, methodName.name),
+      Name.forLibrary(classElement.library2, methodName),
     );
 
     if (overriddenList != null) {

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

@@ -307,19 +307,19 @@ abstract class ConstructorFragment implements ExecutableFragment {
   InstanceFragment? get enclosingFragment;
 
   @override
-  ConstructorFragmentName? get name2;
+  String get name2;
 
   @override
   ConstructorFragment? get nextFragment;
 
-  @override
-  ConstructorFragment? get previousFragment;
-}
-
-/// The name of a [ConstructorFragment].
-abstract class ConstructorFragmentName extends FragmentName {
   /// The offset of the `.` before the name.
+  ///
+  /// It is `null` if the fragment is synthetic, or does not specify an
+  /// explicit name, even if [name2] is `new` in this case.
   int? get periodOffset;
+
+  @override
+  ConstructorFragment? get previousFragment;
 }
 
 /// The base class for all of the elements in the element model.
@@ -916,17 +916,43 @@ abstract class Fragment {
   /// This will be the fragment itself if it is a library fragment.
   LibraryFragment get libraryFragment;
 
-  /// The name of this fragment.
+  /// The name of the fragment.
   ///
-  /// Returns `null` if the fragment does not have a name, e.g. an unnamed
-  /// [ExtensionFragment].
+  /// Never empty.
+  ///
+  /// If a fragment, e.g. an [ExtensionFragment], does not have a name,
+  /// then the name is `null`.
   ///
-  /// Returns `null` if the fragment is an unnamed [ConstructorFragment],
-  /// even if its [ConstructorElement2] has the name `new`.
+  /// For an unnamed [ConstructorFragment] the name is `new`, but [nameOffset2]
+  /// is `null`. If there is an explicit `ClassName.new`, the name is also
+  /// `new`, and [nameOffset2] is not `null`. For a synthetic default unnamed
+  /// [ConstructorElement2] there is always a synthetic [ConstructorFragment]
+  /// with the name `new`, and [nameOffset2] is `null`.
   ///
-  /// Returns `null` if the fragment declaration node does not have the name
-  /// specified, and the parser inserted a synthetic identifier.
-  FragmentName? get name2;
+  /// If the fragment declaration node does not have the name specified, and
+  /// the parser inserted a synthetic token, then the name is `null`, and
+  /// [nameOffset2] is `null`.
+  ///
+  /// For a synthetic [GetterFragment] or [SetterFragment] the name is the
+  /// name of the corresponding non-synthetic [PropertyInducingFragment],
+  /// which is usually not `null`, but could be. And `nameOffset2` is `null`
+  /// for such synthetic fragments.
+  ///
+  /// For a [SetterFragment] this is the identifier, without `=` at the end.
+  String? get name2;
+
+  /// The offset of the [name2] of this element.
+  ///
+  /// If a fragment, e.g. an [ExtensionFragment], does not have a name,
+  /// then the name offset is `null`.
+  ///
+  /// If the fragment declaration node does not have the name specified, and
+  /// the parser inserted a synthetic token, then the name is `null`, and
+  /// the name offset is `null`.
+  ///
+  /// For a synthetic fragment, e.g. [ConstructorFragment] the name offset
+  /// is `null`.
+  int? get nameOffset2;
 
   /// The next fragment in the augmentation chain.
   ///
@@ -949,32 +975,6 @@ abstract class FragmentedElement {
   Fragment get firstFragment;
 }
 
-/// The name of a [Fragment].
-abstract class FragmentName {
-  /// The name of the fragment.
-  ///
-  /// Never empty.
-  ///
-  /// If a fragment, e.g. an [ExtensionFragment], does not have a name,
-  /// then the whole [FragmentName] is `null`.
-  ///
-  /// Similarly, an unnamed [ConstructorFragment] does not have a name, even
-  /// if the [ConstructorElement2] has the name `new`.
-  ///
-  /// If the fragment declaration node does not have the name specified, and
-  /// the parser inserted a synthetic token, then the whole [FragmentName]
-  /// is `null`.
-  ///
-  /// For a [SetterFragment] this is the identifier, without `=` at the end.
-  String get name;
-
-  /// The offset of the end of the name.
-  int get nameEnd;
-
-  /// The offset of the name in the file.
-  int get nameOffset;
-}
-
 /// An element that has a [FunctionType] as its [type].
 ///
 /// This also provides convenient access to the parameters and return type.
@@ -1315,9 +1315,6 @@ abstract class LabelElement2 implements Element2, FragmentedElement {
 
   @override
   LibraryElement2 get library2;
-
-  /// The offset of the name in this element.
-  int get nameOffset;
 }
 
 /// The portion of a [LabelElement2] contributed by a single declaration.
@@ -1667,9 +1664,6 @@ abstract class LocalVariableElement2
 
   /// Whether the variable has an initializer at declaration.
   bool get hasInitializer;
-
-  /// The offset of the name in this element.
-  int get nameOffset;
 }
 
 /// The portion of a [LocalVariableElement2] contributed by a single

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

@@ -98,7 +98,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 = 410;
+  static const int DATA_VERSION = 411;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.