[cfe] Rename offsets

This renames the fragment/builder offsets. Offsets for the first token are called `startOffset`, for the last token `endOffset`, for the first parenthesis of formals `formalsOffset` and for the name `nameOffset`. The default builder offset is renamed to `fileOffset`. Change-Id: I658bf8819ac0de2f56497cd99f72b502a2253525 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/390740 Reviewed-by: Chloe Stefantsova <cstefantsova@google.com> Commit-Queue: Johnni Winther <johnniwinther@google.com>
dart-lang · Oct 18, 2024 · 574a6b3 · 574a6b3
1 parent 1a6ae2e
commit 574a6b3
Show file tree

Hide file tree

Showing 71 changed files with 1,451 additions and 1,468 deletions.
diff --git a/pkg/front_end/lib/src/base/identifiers.dart b/pkg/front_end/lib/src/base/identifiers.dart
@@ -198,7 +198,7 @@ class QualifiedNameBuilder extends QualifiedName {
 
   @override
   // Coverage-ignore(suite): Not run.
-  int get firstOffset => qualifier.charOffset;
+  int get firstOffset => qualifier.fileOffset;
 
   @override
   String toString() => "qualified-name-builder($qualifier, $name)";

diff --git a/pkg/front_end/lib/src/base/scope.dart b/pkg/front_end/lib/src/base/scope.dart
@@ -540,12 +540,12 @@ abstract class ProblemBuilder extends BuilderImpl {
   final Builder builder;
 
   @override
-  final int charOffset;
+  final int fileOffset;
 
   @override
   final Uri fileUri;
 
-  ProblemBuilder(this.name, this.builder, this.charOffset, this.fileUri);
+  ProblemBuilder(this.name, this.builder, this.fileOffset, this.fileUri);
 
   @override
   bool get hasProblem => true;
@@ -1143,10 +1143,10 @@ abstract class MergedScope<T extends Builder> {
           context = messageNonAugmentationMemberConflictCause;
         }
         originLibrary.addProblem(
-            message, newBuilder.charOffset, name.length, newBuilder.fileUri,
+            message, newBuilder.fileOffset, name.length, newBuilder.fileUri,
             context: [
               context.withLocation(existingBuilder.fileUri!,
-                  existingBuilder.charOffset, name.length)
+                  existingBuilder.fileOffset, name.length)
             ]);
       }
     } else {
@@ -1175,15 +1175,15 @@ abstract class MergedScope<T extends Builder> {
               templateUnmatchedAugmentationDeclaration.withArguments(name);
         }
         originLibrary.addProblem(
-            message, newBuilder.charOffset, name.length, newBuilder.fileUri);
+            message, newBuilder.fileOffset, name.length, newBuilder.fileUri);
       } else {
         if (inPatchLibrary &&
             !name.startsWith('_') &&
             !_allowInjectedPublicMember(newBuilder)) {
           originLibrary.addProblem(
               templatePatchInjectionFailed.withArguments(
                   name, originLibrary.importUri),
-              newBuilder.charOffset,
+              newBuilder.fileOffset,
               noLength,
               newBuilder.fileUri);
         }
@@ -1345,13 +1345,13 @@ class MergedClassMemberScope extends MergedScope<SourceClassBuilder> {
                   // Coverage-ignore(suite): Not run.
                   templateNonAugmentationConstructorConflict
                       .withArguments(newConstructor.fullNameForErrors),
-              newConstructor.charOffset,
+              newConstructor.fileOffset,
               noLength,
               newConstructor.fileUri,
               context: [
                 messageNonAugmentationConstructorConflictCause.withLocation(
                     existingConstructor.fileUri!,
-                    existingConstructor.charOffset,
+                    existingConstructor.fileOffset,
                     noLength)
               ]);
         }
@@ -1365,7 +1365,7 @@ class MergedClassMemberScope extends MergedScope<SourceClassBuilder> {
                   // Coverage-ignore(suite): Not run.
                   templateUnmatchedAugmentationConstructor
                       .withArguments(newConstructor.fullNameForErrors),
-              newConstructor.charOffset,
+              newConstructor.fileOffset,
               noLength,
               newConstructor.fileUri);
         } else {
@@ -1384,7 +1384,7 @@ class MergedClassMemberScope extends MergedScope<SourceClassBuilder> {
           originLibrary.addProblem(
               templatePatchInjectionFailed.withArguments(
                   name, originLibrary.importUri),
-              newConstructor.charOffset,
+              newConstructor.fileOffset,
               noLength,
               newConstructor.fileUri);
         }

diff --git a/pkg/front_end/lib/src/builder/builder.dart b/pkg/front_end/lib/src/builder/builder.dart
@@ -16,7 +16,7 @@ abstract class Builder {
 
   Uri? get fileUri;
 
-  int get charOffset;
+  int get fileOffset;
 
   Builder get origin;
 
@@ -367,7 +367,7 @@ abstract class BuilderImpl implements Builder {
   @override
   // Coverage-ignore(suite): Not run.
   void applyAugmentation(Builder augmentation) {
-    unsupported("${runtimeType}.applyAugmentation", charOffset, fileUri);
+    unsupported("${runtimeType}.applyAugmentation", fileOffset, fileUri);
   }
 
   @override

diff --git a/pkg/front_end/lib/src/builder/builtin_type_declaration_builder.dart b/pkg/front_end/lib/src/builder/builtin_type_declaration_builder.dart
@@ -10,7 +10,7 @@ abstract class BuiltinTypeDeclarationBuilder extends TypeDeclarationBuilderImpl
   final LibraryBuilder parent;
 
   @override
-  final int charOffset;
+  final int fileOffset;
 
   @override
   final String name;
@@ -21,7 +21,7 @@ abstract class BuiltinTypeDeclarationBuilder extends TypeDeclarationBuilderImpl
   final Uri fileUri;
 
   BuiltinTypeDeclarationBuilder(
-      this.name, this.type, this.parent, this.charOffset)
+      this.name, this.type, this.parent, this.fileOffset)
       : fileUri = parent.fileUri;
 
   @override

diff --git a/pkg/front_end/lib/src/builder/formal_parameter_builder.dart b/pkg/front_end/lib/src/builder/formal_parameter_builder.dart
@@ -57,7 +57,7 @@ class FormalParameterBuilder extends BuilderImpl
   SourceFunctionBuilder? _parent;
 
   @override
-  final int charOffset;
+  final int fileOffset;
 
   final Modifiers modifiers;
 
@@ -98,7 +98,7 @@ class FormalParameterBuilder extends BuilderImpl
   final bool isWildcard;
 
   FormalParameterBuilder(
-      this.kind, this.modifiers, this.type, this.name, this.charOffset,
+      this.kind, this.modifiers, this.type, this.name, this.fileOffset,
       {required this.fileUri,
       this.isExtensionThis = false,
       required this.hasImmediatelyDeclaredInitializer,
@@ -182,7 +182,7 @@ class FormalParameterBuilder extends BuilderImpl
           isLowered: isExtensionThis,
           isSynthesized: name == noNameSentinel,
           isWildcard: isWildcard)
-        ..fileOffset = charOffset;
+        ..fileOffset = fileOffset;
     }
     return variable!;
   }
@@ -200,7 +200,7 @@ class FormalParameterBuilder extends BuilderImpl
         modifiers | Modifiers.InitializingFormal,
         builderFactory.addInferableType(),
         name,
-        charOffset,
+        fileOffset,
         fileUri: fileUri,
         isExtensionThis: isExtensionThis,
         hasImmediatelyDeclaredInitializer: hasImmediatelyDeclaredInitializer)
@@ -215,7 +215,7 @@ class FormalParameterBuilder extends BuilderImpl
           modifiers | Modifiers.Final | Modifiers.InitializingFormal,
           type,
           name,
-          charOffset,
+          fileOffset,
           fileUri: fileUri,
           isExtensionThis: isExtensionThis,
           hasImmediatelyDeclaredInitializer: hasImmediatelyDeclaredInitializer)
@@ -227,7 +227,7 @@ class FormalParameterBuilder extends BuilderImpl
           modifiers | Modifiers.Final | Modifiers.SuperInitializingFormal,
           type,
           name,
-          charOffset,
+          fileOffset,
           fileUri: fileUri,
           isExtensionThis: isExtensionThis,
           hasImmediatelyDeclaredInitializer: hasImmediatelyDeclaredInitializer)

diff --git a/pkg/front_end/lib/src/builder/function_type_builder.dart b/pkg/front_end/lib/src/builder/function_type_builder.dart
@@ -318,7 +318,7 @@ abstract class FunctionTypeBuilderImpl extends FunctionTypeBuilder {
           newTypeVariables ??= typeVariables.toList();
           StructuralVariableBuilder newTypeVariableBuilder =
               newTypeVariables[i] = new StructuralVariableBuilder(
-                  variable.name, variable.charOffset, variable.fileUri,
+                  variable.name, variable.fileOffset, variable.fileUri,
                   bound: bound);
           unboundTypeVariables.add(newTypeVariableBuilder);
           if (functionTypeUpperSubstitution == null) {

diff --git a/pkg/front_end/lib/src/builder/invalid_type_declaration_builder.dart b/pkg/front_end/lib/src/builder/invalid_type_declaration_builder.dart
@@ -24,7 +24,7 @@ class InvalidTypeDeclarationBuilder extends TypeDeclarationBuilderImpl
 
   @override
   // Coverage-ignore(suite): Not run.
-  int get charOffset => message.charOffset;
+  int get fileOffset => message.charOffset;
 
   @override
   // Coverage-ignore(suite): Not run.

diff --git a/pkg/front_end/lib/src/builder/library_builder.dart b/pkg/front_end/lib/src/builder/library_builder.dart
@@ -407,7 +407,7 @@ abstract class LibraryBuilderImpl extends BuilderImpl
   Builder? get parent => null;
 
   @override
-  int get charOffset => -1;
+  int get fileOffset => -1;
 
   @override
   bool get isPart => false;

diff --git a/pkg/front_end/lib/src/builder/member_builder.dart b/pkg/front_end/lib/src/builder/member_builder.dart
@@ -136,7 +136,7 @@ abstract class BuilderClassMember implements ClassMember {
   MemberBuilderImpl get memberBuilder;
 
   @override
-  int get charOffset => memberBuilder.charOffset;
+  int get charOffset => memberBuilder.fileOffset;
 
   @override
   DeclarationBuilder get declarationBuilder =>

diff --git a/pkg/front_end/lib/src/builder/metadata_builder.dart b/pkg/front_end/lib/src/builder/metadata_builder.dart
@@ -15,9 +15,9 @@ import '../source/source_library_builder.dart' show SourceLibraryBuilder;
 
 class MetadataBuilder {
   /// Token for `@` for annotations that have not yet been parsed.
-  Token? _beginToken;
+  Token? _atToken;
 
-  final int charOffset;
+  final int atOffset;
 
   /// `true` if the annotation begins with 'patch'.
   ///
@@ -28,12 +28,12 @@ class MetadataBuilder {
   /// Expression for an already parsed annotation.
   Expression? _expression;
 
-  MetadataBuilder(Token this._beginToken)
-      : charOffset = _beginToken.charOffset,
-        hasPatch = _beginToken.next?.lexeme == 'patch';
+  MetadataBuilder(Token this._atToken)
+      : atOffset = _atToken.charOffset,
+        hasPatch = _atToken.next?.lexeme == 'patch';
 
   // Coverage-ignore(suite): Not run.
-  Token? get beginToken => _beginToken;
+  Token? get beginToken => _atToken;
 
   static void buildAnnotations(
       Annotatable parent,
@@ -59,15 +59,15 @@ class MetadataBuilder {
 
     for (int i = 0; i < metadata.length; ++i) {
       MetadataBuilder annotationBuilder = metadata[i];
-      Token? beginToken = annotationBuilder._beginToken;
+      Token? beginToken = annotationBuilder._atToken;
       if (beginToken != null) {
         bodyBuilder ??= library.loader.createBodyBuilderForOutlineExpression(
             library, bodyBuilderContext, scope, fileUri);
         Expression annotation = bodyBuilder.parseAnnotation(beginToken);
-        annotationBuilder._beginToken = null;
+        annotationBuilder._atToken = null;
         if (createFileUriExpression) {
           annotation = new FileUriExpression(annotation, fileUri)
-            ..fileOffset = annotationBuilder.charOffset;
+            ..fileOffset = annotationBuilder.atOffset;
         }
         // Record the index of [annotation] in `parent.annotations`.
         parsedAnnotationBuilders[annotationBuilder] = parent.annotations.length;
@@ -98,7 +98,7 @@ class MetadataBuilder {
         // Coverage-ignore(suite): Not run.
         if (createFileUriExpression && annotation is! FileUriExpression) {
           annotation = new FileUriExpression(annotation, fileUri)
-            ..fileOffset = annotationBuilder.charOffset;
+            ..fileOffset = annotationBuilder.atOffset;
         }
         parent.addAnnotation(annotation);
       }

diff --git a/pkg/front_end/lib/src/builder/named_type_builder.dart b/pkg/front_end/lib/src/builder/named_type_builder.dart
@@ -244,7 +244,7 @@ abstract class NamedTypeBuilderImpl extends NamedTypeBuilder {
         template = templateNotAType;
         context = <LocatedMessage>[
           messageNotATypeContext.withLocation(
-              member.fileUri!, member.charOffset, nameLength)
+              member.fileUri!, member.fileOffset, nameLength)
         ];
         message = template.withArguments(nameText);
       }
@@ -391,7 +391,7 @@ abstract class NamedTypeBuilderImpl extends NamedTypeBuilder {
     }
     library.addProblem(message, charOffset!, noLength, fileUri, context: [
       messageTypedefCause.withLocation(
-          aliasBuilder.fileUri, aliasBuilder.charOffset, noLength),
+          aliasBuilder.fileUri, aliasBuilder.fileOffset, noLength),
     ]);
     return null;
   }

diff --git a/pkg/front_end/lib/src/builder/omitted_type_declaration_builder.dart b/pkg/front_end/lib/src/builder/omitted_type_declaration_builder.dart
@@ -23,7 +23,7 @@ class OmittedTypeDeclarationBuilder extends TypeDeclarationBuilderImpl
       this.name, this.omittedTypeBuilder, this.parent);
 
   @override
-  int get charOffset => TreeNode.noOffset;
+  int get fileOffset => TreeNode.noOffset;
 
   @override
   DartType buildAliasedType(

diff --git a/pkg/front_end/lib/src/builder/prefix_builder.dart b/pkg/front_end/lib/src/builder/prefix_builder.dart
@@ -35,7 +35,7 @@ class PrefixBuilder extends BuilderImpl {
   final Uri fileUri;
 
   @override
-  final int charOffset;
+  final int fileOffset;
 
   final LoadLibraryBuilder? loadLibraryBuilder;
 
@@ -45,7 +45,7 @@ class PrefixBuilder extends BuilderImpl {
       {required this.fileUri,
       required int prefixOffset,
       required int importOffset})
-      : charOffset = prefixOffset,
+      : fileOffset = prefixOffset,
         isWildcard = name == '_' {
     assert(deferred == (loadLibraryBuilder != null),
         "LoadLibraryBuilder must be provided iff prefix is deferred.");

diff --git a/pkg/front_end/lib/src/builder/type_alias_builder.dart b/pkg/front_end/lib/src/builder/type_alias_builder.dart
@@ -238,7 +238,7 @@ abstract class TypeAliasBuilderImpl extends TypeDeclarationBuilderImpl
       // Coverage-ignore(suite): Not run.
       case ExtensionBuilder():
         unexpected(
-            "type", "${rhsTypeDeclaration.runtimeType}", charOffset, fileUri);
+            "type", "${rhsTypeDeclaration.runtimeType}", fileOffset, fileUri);
     }
   }
 
@@ -259,7 +259,7 @@ abstract class TypeAliasBuilderImpl extends TypeDeclarationBuilderImpl
         // alias, which is ensured by the call to [_ensureUnaliasedType]
         // earlier.
         return unexpected(
-            "unaliased", "${rhsDeclaration.runtimeType}", charOffset, fileUri);
+            "unaliased", "${rhsDeclaration.runtimeType}", fileOffset, fileUri);
       case ClassBuilder():
       case ExtensionTypeDeclarationBuilder():
       case NominalVariableBuilder():
@@ -343,7 +343,7 @@ abstract class TypeAliasBuilderImpl extends TypeDeclarationBuilderImpl
         // Cyclic type alias.
         currentAliasBuilder.libraryBuilder.addProblem(
             templateCyclicTypedef.withArguments(this.name),
-            charOffset,
+            fileOffset,
             noLength,
             fileUri);
         // Ensure that it is not reported again.
@@ -367,7 +367,7 @@ abstract class TypeAliasBuilderImpl extends TypeDeclarationBuilderImpl
                     typeVariable, const NullabilityBuilder.omitted(),
                     arguments: const [],
                     fileUri: fileUri,
-                    charOffset: charOffset,
+                    charOffset: fileOffset,
                     instanceTypeVariableAccess:
                         InstanceTypeVariableAccessState.Unexpected),
           ];
@@ -388,7 +388,7 @@ abstract class TypeAliasBuilderImpl extends TypeDeclarationBuilderImpl
                 usedAsClassFileUri,
                 context: [
                   messageTypedefTypeVariableNotConstructorCause.withLocation(
-                      current.fileUri!, current.charOffset, noLength),
+                      current.fileUri!, current.fileOffset, noLength),
                 ]);
             return this;
           }
@@ -447,7 +447,7 @@ abstract class TypeAliasBuilderImpl extends TypeDeclarationBuilderImpl
           previousAliasBuilder.libraryBuilder.addProblem(
               templateTypeArgumentMismatch.withArguments(
                   currentAliasBuilder.typeVariables?.length ?? 0),
-              previousAliasBuilder.charOffset,
+              previousAliasBuilder.fileOffset,
               noLength,
               previousAliasBuilder.fileUri);
           previousAliasBuilder.thisType = const InvalidType();