[cfe] Rename offsets in field fragment/builder

+ make constructors use named parameters.

Change-Id: I226db6c8d409949eede8b7e220ee5b445b7d5080
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/392361
Commit-Queue: Johnni Winther <[email protected]>
Reviewed-by: Chloe Stefantsova <[email protected]>

Author: johnniwinther

pkg/front_end/lib/src/fragment/field.dart

@@ -9,8 +9,8 @@ class FieldFragment implements Fragment {
   final String name;
 
   final Uri fileUri;
-  final int charOffset;
-  final int charEndOffset;
+  final int nameOffset;
+  final int endOffset;
   Token? _initializerToken;
   Token? _constInitializerToken;
   final List<MetadataBuilder>? metadata;
@@ -23,8 +23,8 @@ class FieldFragment implements Fragment {
   FieldFragment(
       {required this.name,
       required this.fileUri,
-      required this.charOffset,
-      required this.charEndOffset,
+      required this.nameOffset,
+      required this.endOffset,
       required Token? initializerToken,
       required Token? constInitializerToken,
       required this.metadata,
@@ -60,5 +60,5 @@ class FieldFragment implements Fragment {
   }
 
   @override
-  String toString() => '$runtimeType($name,$fileUri,$charOffset)';
+  String toString() => '$runtimeType($name,$fileUri,$nameOffset)';
 }

pkg/front_end/lib/src/fragment/typedef.dart

@@ -13,7 +13,7 @@ class TypedefFragment implements Fragment {
   final List<NominalParameterBuilder>? typeParameters;
   final TypeBuilder type;
   final Uri fileUri;
-  final int fileOffset;
+  final int nameOffset;
 
   SourceTypeAliasBuilder? _builder;
 
@@ -23,7 +23,7 @@ class TypedefFragment implements Fragment {
       required this.typeParameters,
       required this.type,
       required this.fileUri,
-      required this.fileOffset});
+      required this.nameOffset});
 
   @override
   // Coverage-ignore(suite): Not run.
@@ -38,5 +38,5 @@ class TypedefFragment implements Fragment {
   }
 
   @override
-  String toString() => "$runtimeType($name,$fileUri,$fileOffset)";
+  String toString() => "$runtimeType($name,$fileUri,$nameOffset)";
 }

pkg/front_end/lib/src/source/builder_factory.dart

@@ -288,7 +288,7 @@ abstract class BuilderFactory {
       String name,
       List<NominalParameterBuilder>? typeParameters,
       TypeBuilder type,
-      int charOffset);
+      int nameOffset);
 
   void addClassMethod(
       {required OffsetMap offsetMap,
@@ -344,7 +344,7 @@ abstract class BuilderFactory {
       {required List<MetadataBuilder>? metadata,
       required TypeBuilder type,
       required String name,
-      required int charOffset});
+      required int nameOffset});
 
   void addFactoryMethod(
       {required OffsetMap offsetMap,
@@ -498,8 +498,8 @@ class FieldInfo {
   final Identifier identifier;
   final Token? initializerToken;
   final Token? beforeLast;
-  final int charEndOffset;
+  final int endOffset;
 
   const FieldInfo(this.identifier, this.initializerToken, this.beforeLast,
-      this.charEndOffset);
+      this.endOffset);
 }

pkg/front_end/lib/src/source/outline_builder.dart

@@ -1655,7 +1655,7 @@ class OutlineBuilder extends StackListenerImpl {
             metadata: null,
             type: formal.type,
             name: formal.name,
-            charOffset: formal.fileOffset);
+            nameOffset: formal.fileOffset);
         formals[i] = formal.forPrimaryConstructor(_builderFactory);
       }
       if (inExtensionType) {

pkg/front_end/lib/src/source/source_builder_factory.dart

@@ -1308,7 +1308,7 @@ class BuilderFactoryImpl implements BuilderFactory, BuilderFactoryResult {
       String name,
       List<NominalParameterBuilder>? typeParameters,
       TypeBuilder type,
-      int charOffset) {
+      int nameOffset) {
     if (typeParameters != null) {
       for (NominalParameterBuilder typeParameter in typeParameters) {
         typeParameter.varianceCalculationValue =
@@ -1326,7 +1326,7 @@ class BuilderFactoryImpl implements BuilderFactory, BuilderFactoryResult {
         typeParameters: typeParameters,
         type: type,
         fileUri: _compilationUnit.fileUri,
-        fileOffset: charOffset);
+        nameOffset: nameOffset);
     _addFragment(fragment);
   }
 
@@ -1687,17 +1687,17 @@ class BuilderFactoryImpl implements BuilderFactory, BuilderFactoryResult {
       {required List<MetadataBuilder>? metadata,
       required TypeBuilder type,
       required String name,
-      required int charOffset}) {
+      required int nameOffset}) {
     _declarationFragments.current.addPrimaryConstructorField(_addField(
-        metadata,
-        Modifiers.Final,
-        /* isTopLevel = */ false,
-        type,
-        name,
-        /* charOffset = */ charOffset,
-        /* charEndOffset = */ charOffset,
-        /* initializerToken = */ null,
-        /* hasInitializer = */ false));
+        metadata: metadata,
+        modifiers: Modifiers.Final,
+        isTopLevel: false,
+        type: type,
+        name: name,
+        nameOffset: nameOffset,
+        endOffset: nameOffset,
+        initializerToken: null,
+        hasInitializer: false));
   }
 
   @override
@@ -2122,39 +2122,39 @@ class BuilderFactoryImpl implements BuilderFactory, BuilderFactoryResult {
       offsetMap.registerField(
           info.identifier,
           _addField(
-              metadata,
-              modifiers,
-              isTopLevel,
-              type ?? addInferableType(),
-              info.identifier.name,
-              info.identifier.nameOffset,
-              info.charEndOffset,
-              startToken,
-              hasInitializer,
+              metadata: metadata,
+              modifiers: modifiers,
+              isTopLevel: isTopLevel,
+              type: type ?? addInferableType(),
+              name: info.identifier.name,
+              nameOffset: info.identifier.nameOffset,
+              endOffset: info.endOffset,
+              initializerToken: startToken,
+              hasInitializer: hasInitializer,
               constInitializerToken:
                   potentiallyNeedInitializerInOutline ? startToken : null));
     }
   }
 
   FieldFragment _addField(
-      List<MetadataBuilder>? metadata,
-      Modifiers modifiers,
-      bool isTopLevel,
-      TypeBuilder type,
-      String name,
-      int charOffset,
-      int charEndOffset,
-      Token? initializerToken,
-      bool hasInitializer,
-      {Token? constInitializerToken}) {
+      {required List<MetadataBuilder>? metadata,
+      required Modifiers modifiers,
+      required bool isTopLevel,
+      required TypeBuilder type,
+      required String name,
+      required int nameOffset,
+      required int endOffset,
+      required Token? initializerToken,
+      required bool hasInitializer,
+      Token? constInitializerToken}) {
     if (hasInitializer) {
       modifiers |= Modifiers.HasInitializer;
     }
     FieldFragment fragment = new FieldFragment(
         name: name,
         fileUri: _compilationUnit.fileUri,
-        charOffset: charOffset,
-        charEndOffset: charEndOffset,
+        nameOffset: nameOffset,
+        endOffset: endOffset,
         initializerToken: initializerToken,
         constInitializerToken: constInitializerToken,
         metadata: metadata,

pkg/front_end/lib/src/source/source_enum_builder.dart

@@ -315,17 +315,18 @@ class SourceEnumBuilder extends SourceClassBuilder {
     }
 
     SourceFieldBuilder valuesBuilder = new SourceFieldBuilder(
-        /* metadata = */ null,
-        listType,
-        "values",
-        Modifiers.Const | Modifiers.Static | Modifiers.HasInitializer,
-        /* isTopLevel = */ false,
-        libraryBuilder,
-        this,
-        fileUri,
-        fileOffset,
-        fileOffset,
-        staticFieldNameScheme,
+        metadata: null,
+        type: listType,
+        name: "values",
+        modifiers:
+            Modifiers.Const | Modifiers.Static | Modifiers.HasInitializer,
+        isTopLevel: false,
+        libraryBuilder: libraryBuilder,
+        declarationBuilder: this,
+        fileUri: fileUri,
+        nameOffset: fileOffset,
+        endOffset: fileOffset,
+        nameScheme: staticFieldNameScheme,
         fieldReference: valuesFieldReference,
         fieldGetterReference: valuesGetterReference,
         fieldSetterReference: valuesSetterReference,
@@ -436,11 +437,11 @@ class SourceEnumBuilder extends SourceClassBuilder {
           // Report the error on the member that occurs later in the code.
           int existingOffset;
           int duplicateOffset;
-          if (existing.fileOffset < enumConstantInfo.charOffset) {
+          if (existing.fileOffset < enumConstantInfo.nameOffset) {
             existingOffset = existing.fileOffset;
-            duplicateOffset = enumConstantInfo.charOffset;
+            duplicateOffset = enumConstantInfo.nameOffset;
           } else {
-            existingOffset = enumConstantInfo.charOffset;
+            existingOffset = enumConstantInfo.nameOffset;
             duplicateOffset = existing.fileOffset;
           }
 
@@ -467,7 +468,7 @@ class SourceEnumBuilder extends SourceClassBuilder {
         } else if (name == className) {
           libraryBuilder.addProblem(
               templateEnumConstantSameNameAsEnclosing.withArguments(name),
-              enumConstantInfo.charOffset,
+              enumConstantInfo.nameOffset,
               name.length,
               libraryBuilder.fileUri);
         }
@@ -481,17 +482,18 @@ class SourceEnumBuilder extends SourceClassBuilder {
           setterReference = indexedClass!.lookupSetterReference(nameName);
         }
         SourceFieldBuilder fieldBuilder = new SourceFieldBuilder(
-            metadata,
-            libraryBuilder.loader.inferableTypes.addInferableType(),
-            name,
-            Modifiers.Const | Modifiers.Static | Modifiers.HasInitializer,
-            /* isTopLevel = */ false,
-            libraryBuilder,
-            this,
-            fileUri,
-            enumConstantInfo.charOffset,
-            enumConstantInfo.charOffset,
-            staticFieldNameScheme,
+            metadata: metadata,
+            type: libraryBuilder.loader.inferableTypes.addInferableType(),
+            name: name,
+            modifiers:
+                Modifiers.Const | Modifiers.Static | Modifiers.HasInitializer,
+            isTopLevel: false,
+            libraryBuilder: libraryBuilder,
+            declarationBuilder: this,
+            fileUri: fileUri,
+            nameOffset: enumConstantInfo.nameOffset,
+            endOffset: enumConstantInfo.nameOffset,
+            nameScheme: staticFieldNameScheme,
             fieldReference: fieldReference,
             fieldGetterReference: getterReference,
             fieldSetterReference: setterReference,
@@ -608,7 +610,7 @@ class SourceEnumBuilder extends SourceClassBuilder {
     String fullConstructorNameForErrors =
         enumConstantInfo.constructorReferenceBuilder?.fullNameForErrors ?? name;
     int fileOffset = enumConstantInfo.constructorReferenceBuilder?.charOffset ??
-        enumConstantInfo.charOffset;
+        enumConstantInfo.nameOffset;
     constructorName = constructorName == "new" ? "" : constructorName;
     MemberBuilder? constructorBuilder =
         nameSpace.lookupConstructor(constructorName);
@@ -794,9 +796,9 @@ class SourceEnumBuilder extends SourceClassBuilder {
 class EnumConstantInfo {
   final List<MetadataBuilder>? metadata;
   final String name;
-  final int charOffset;
+  final int nameOffset;
   ConstructorReferenceBuilder? constructorReferenceBuilder;
   Token? argumentsBeginToken;
 
-  EnumConstantInfo(this.metadata, this.name, this.charOffset);
+  EnumConstantInfo(this.metadata, this.name, this.nameOffset);
 }