Skip to content

Commit 574a6b3

Browse files
johnniwintherCommit Queue
johnniwinther
authored and
Commit Queue
committed
[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 <[email protected]> Commit-Queue: Johnni Winther <[email protected]>
1 parent 1a6ae2e commit 574a6b3

File tree

71 files changed

+1451
-1468
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1451
-1468
lines changed

‎pkg/front_end/lib/src/base/identifiers.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ class QualifiedNameBuilder extends QualifiedName {
198198

199199
@override
200200
// Coverage-ignore(suite): Not run.
201-
int get firstOffset => qualifier.charOffset;
201+
int get firstOffset => qualifier.fileOffset;
202202

203203
@override
204204
String toString() => "qualified-name-builder($qualifier, $name)";

‎pkg/front_end/lib/src/base/scope.dart

+10-10
Original file line numberDiff line numberDiff line change
@@ -540,12 +540,12 @@ abstract class ProblemBuilder extends BuilderImpl {
540540
final Builder builder;
541541

542542
@override
543-
final int charOffset;
543+
final int fileOffset;
544544

545545
@override
546546
final Uri fileUri;
547547

548-
ProblemBuilder(this.name, this.builder, this.charOffset, this.fileUri);
548+
ProblemBuilder(this.name, this.builder, this.fileOffset, this.fileUri);
549549

550550
@override
551551
bool get hasProblem => true;
@@ -1143,10 +1143,10 @@ abstract class MergedScope<T extends Builder> {
11431143
context = messageNonAugmentationMemberConflictCause;
11441144
}
11451145
originLibrary.addProblem(
1146-
message, newBuilder.charOffset, name.length, newBuilder.fileUri,
1146+
message, newBuilder.fileOffset, name.length, newBuilder.fileUri,
11471147
context: [
11481148
context.withLocation(existingBuilder.fileUri!,
1149-
existingBuilder.charOffset, name.length)
1149+
existingBuilder.fileOffset, name.length)
11501150
]);
11511151
}
11521152
} else {
@@ -1175,15 +1175,15 @@ abstract class MergedScope<T extends Builder> {
11751175
templateUnmatchedAugmentationDeclaration.withArguments(name);
11761176
}
11771177
originLibrary.addProblem(
1178-
message, newBuilder.charOffset, name.length, newBuilder.fileUri);
1178+
message, newBuilder.fileOffset, name.length, newBuilder.fileUri);
11791179
} else {
11801180
if (inPatchLibrary &&
11811181
!name.startsWith('_') &&
11821182
!_allowInjectedPublicMember(newBuilder)) {
11831183
originLibrary.addProblem(
11841184
templatePatchInjectionFailed.withArguments(
11851185
name, originLibrary.importUri),
1186-
newBuilder.charOffset,
1186+
newBuilder.fileOffset,
11871187
noLength,
11881188
newBuilder.fileUri);
11891189
}
@@ -1345,13 +1345,13 @@ class MergedClassMemberScope extends MergedScope<SourceClassBuilder> {
13451345
// Coverage-ignore(suite): Not run.
13461346
templateNonAugmentationConstructorConflict
13471347
.withArguments(newConstructor.fullNameForErrors),
1348-
newConstructor.charOffset,
1348+
newConstructor.fileOffset,
13491349
noLength,
13501350
newConstructor.fileUri,
13511351
context: [
13521352
messageNonAugmentationConstructorConflictCause.withLocation(
13531353
existingConstructor.fileUri!,
1354-
existingConstructor.charOffset,
1354+
existingConstructor.fileOffset,
13551355
noLength)
13561356
]);
13571357
}
@@ -1365,7 +1365,7 @@ class MergedClassMemberScope extends MergedScope<SourceClassBuilder> {
13651365
// Coverage-ignore(suite): Not run.
13661366
templateUnmatchedAugmentationConstructor
13671367
.withArguments(newConstructor.fullNameForErrors),
1368-
newConstructor.charOffset,
1368+
newConstructor.fileOffset,
13691369
noLength,
13701370
newConstructor.fileUri);
13711371
} else {
@@ -1384,7 +1384,7 @@ class MergedClassMemberScope extends MergedScope<SourceClassBuilder> {
13841384
originLibrary.addProblem(
13851385
templatePatchInjectionFailed.withArguments(
13861386
name, originLibrary.importUri),
1387-
newConstructor.charOffset,
1387+
newConstructor.fileOffset,
13881388
noLength,
13891389
newConstructor.fileUri);
13901390
}

‎pkg/front_end/lib/src/builder/builder.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ abstract class Builder {
1616

1717
Uri? get fileUri;
1818

19-
int get charOffset;
19+
int get fileOffset;
2020

2121
Builder get origin;
2222

@@ -367,7 +367,7 @@ abstract class BuilderImpl implements Builder {
367367
@override
368368
// Coverage-ignore(suite): Not run.
369369
void applyAugmentation(Builder augmentation) {
370-
unsupported("${runtimeType}.applyAugmentation", charOffset, fileUri);
370+
unsupported("${runtimeType}.applyAugmentation", fileOffset, fileUri);
371371
}
372372

373373
@override

‎pkg/front_end/lib/src/builder/builtin_type_declaration_builder.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ abstract class BuiltinTypeDeclarationBuilder extends TypeDeclarationBuilderImpl
1010
final LibraryBuilder parent;
1111

1212
@override
13-
final int charOffset;
13+
final int fileOffset;
1414

1515
@override
1616
final String name;
@@ -21,7 +21,7 @@ abstract class BuiltinTypeDeclarationBuilder extends TypeDeclarationBuilderImpl
2121
final Uri fileUri;
2222

2323
BuiltinTypeDeclarationBuilder(
24-
this.name, this.type, this.parent, this.charOffset)
24+
this.name, this.type, this.parent, this.fileOffset)
2525
: fileUri = parent.fileUri;
2626

2727
@override

‎pkg/front_end/lib/src/builder/formal_parameter_builder.dart

+6-6
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class FormalParameterBuilder extends BuilderImpl
5757
SourceFunctionBuilder? _parent;
5858

5959
@override
60-
final int charOffset;
60+
final int fileOffset;
6161

6262
final Modifiers modifiers;
6363

@@ -98,7 +98,7 @@ class FormalParameterBuilder extends BuilderImpl
9898
final bool isWildcard;
9999

100100
FormalParameterBuilder(
101-
this.kind, this.modifiers, this.type, this.name, this.charOffset,
101+
this.kind, this.modifiers, this.type, this.name, this.fileOffset,
102102
{required this.fileUri,
103103
this.isExtensionThis = false,
104104
required this.hasImmediatelyDeclaredInitializer,
@@ -182,7 +182,7 @@ class FormalParameterBuilder extends BuilderImpl
182182
isLowered: isExtensionThis,
183183
isSynthesized: name == noNameSentinel,
184184
isWildcard: isWildcard)
185-
..fileOffset = charOffset;
185+
..fileOffset = fileOffset;
186186
}
187187
return variable!;
188188
}
@@ -200,7 +200,7 @@ class FormalParameterBuilder extends BuilderImpl
200200
modifiers | Modifiers.InitializingFormal,
201201
builderFactory.addInferableType(),
202202
name,
203-
charOffset,
203+
fileOffset,
204204
fileUri: fileUri,
205205
isExtensionThis: isExtensionThis,
206206
hasImmediatelyDeclaredInitializer: hasImmediatelyDeclaredInitializer)
@@ -215,7 +215,7 @@ class FormalParameterBuilder extends BuilderImpl
215215
modifiers | Modifiers.Final | Modifiers.InitializingFormal,
216216
type,
217217
name,
218-
charOffset,
218+
fileOffset,
219219
fileUri: fileUri,
220220
isExtensionThis: isExtensionThis,
221221
hasImmediatelyDeclaredInitializer: hasImmediatelyDeclaredInitializer)
@@ -227,7 +227,7 @@ class FormalParameterBuilder extends BuilderImpl
227227
modifiers | Modifiers.Final | Modifiers.SuperInitializingFormal,
228228
type,
229229
name,
230-
charOffset,
230+
fileOffset,
231231
fileUri: fileUri,
232232
isExtensionThis: isExtensionThis,
233233
hasImmediatelyDeclaredInitializer: hasImmediatelyDeclaredInitializer)

‎pkg/front_end/lib/src/builder/function_type_builder.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ abstract class FunctionTypeBuilderImpl extends FunctionTypeBuilder {
318318
newTypeVariables ??= typeVariables.toList();
319319
StructuralVariableBuilder newTypeVariableBuilder =
320320
newTypeVariables[i] = new StructuralVariableBuilder(
321-
variable.name, variable.charOffset, variable.fileUri,
321+
variable.name, variable.fileOffset, variable.fileUri,
322322
bound: bound);
323323
unboundTypeVariables.add(newTypeVariableBuilder);
324324
if (functionTypeUpperSubstitution == null) {

‎pkg/front_end/lib/src/builder/invalid_type_declaration_builder.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class InvalidTypeDeclarationBuilder extends TypeDeclarationBuilderImpl
2424

2525
@override
2626
// Coverage-ignore(suite): Not run.
27-
int get charOffset => message.charOffset;
27+
int get fileOffset => message.charOffset;
2828

2929
@override
3030
// Coverage-ignore(suite): Not run.

‎pkg/front_end/lib/src/builder/library_builder.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ abstract class LibraryBuilderImpl extends BuilderImpl
407407
Builder? get parent => null;
408408

409409
@override
410-
int get charOffset => -1;
410+
int get fileOffset => -1;
411411

412412
@override
413413
bool get isPart => false;

‎pkg/front_end/lib/src/builder/member_builder.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ abstract class BuilderClassMember implements ClassMember {
136136
MemberBuilderImpl get memberBuilder;
137137

138138
@override
139-
int get charOffset => memberBuilder.charOffset;
139+
int get charOffset => memberBuilder.fileOffset;
140140

141141
@override
142142
DeclarationBuilder get declarationBuilder =>

‎pkg/front_end/lib/src/builder/metadata_builder.dart

+10-10
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import '../source/source_library_builder.dart' show SourceLibraryBuilder;
1515

1616
class MetadataBuilder {
1717
/// Token for `@` for annotations that have not yet been parsed.
18-
Token? _beginToken;
18+
Token? _atToken;
1919

20-
final int charOffset;
20+
final int atOffset;
2121

2222
/// `true` if the annotation begins with 'patch'.
2323
///
@@ -28,12 +28,12 @@ class MetadataBuilder {
2828
/// Expression for an already parsed annotation.
2929
Expression? _expression;
3030

31-
MetadataBuilder(Token this._beginToken)
32-
: charOffset = _beginToken.charOffset,
33-
hasPatch = _beginToken.next?.lexeme == 'patch';
31+
MetadataBuilder(Token this._atToken)
32+
: atOffset = _atToken.charOffset,
33+
hasPatch = _atToken.next?.lexeme == 'patch';
3434

3535
// Coverage-ignore(suite): Not run.
36-
Token? get beginToken => _beginToken;
36+
Token? get beginToken => _atToken;
3737

3838
static void buildAnnotations(
3939
Annotatable parent,
@@ -59,15 +59,15 @@ class MetadataBuilder {
5959

6060
for (int i = 0; i < metadata.length; ++i) {
6161
MetadataBuilder annotationBuilder = metadata[i];
62-
Token? beginToken = annotationBuilder._beginToken;
62+
Token? beginToken = annotationBuilder._atToken;
6363
if (beginToken != null) {
6464
bodyBuilder ??= library.loader.createBodyBuilderForOutlineExpression(
6565
library, bodyBuilderContext, scope, fileUri);
6666
Expression annotation = bodyBuilder.parseAnnotation(beginToken);
67-
annotationBuilder._beginToken = null;
67+
annotationBuilder._atToken = null;
6868
if (createFileUriExpression) {
6969
annotation = new FileUriExpression(annotation, fileUri)
70-
..fileOffset = annotationBuilder.charOffset;
70+
..fileOffset = annotationBuilder.atOffset;
7171
}
7272
// Record the index of [annotation] in `parent.annotations`.
7373
parsedAnnotationBuilders[annotationBuilder] = parent.annotations.length;
@@ -98,7 +98,7 @@ class MetadataBuilder {
9898
// Coverage-ignore(suite): Not run.
9999
if (createFileUriExpression && annotation is! FileUriExpression) {
100100
annotation = new FileUriExpression(annotation, fileUri)
101-
..fileOffset = annotationBuilder.charOffset;
101+
..fileOffset = annotationBuilder.atOffset;
102102
}
103103
parent.addAnnotation(annotation);
104104
}

‎pkg/front_end/lib/src/builder/named_type_builder.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ abstract class NamedTypeBuilderImpl extends NamedTypeBuilder {
244244
template = templateNotAType;
245245
context = <LocatedMessage>[
246246
messageNotATypeContext.withLocation(
247-
member.fileUri!, member.charOffset, nameLength)
247+
member.fileUri!, member.fileOffset, nameLength)
248248
];
249249
message = template.withArguments(nameText);
250250
}
@@ -391,7 +391,7 @@ abstract class NamedTypeBuilderImpl extends NamedTypeBuilder {
391391
}
392392
library.addProblem(message, charOffset!, noLength, fileUri, context: [
393393
messageTypedefCause.withLocation(
394-
aliasBuilder.fileUri, aliasBuilder.charOffset, noLength),
394+
aliasBuilder.fileUri, aliasBuilder.fileOffset, noLength),
395395
]);
396396
return null;
397397
}

‎pkg/front_end/lib/src/builder/omitted_type_declaration_builder.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class OmittedTypeDeclarationBuilder extends TypeDeclarationBuilderImpl
2323
this.name, this.omittedTypeBuilder, this.parent);
2424

2525
@override
26-
int get charOffset => TreeNode.noOffset;
26+
int get fileOffset => TreeNode.noOffset;
2727

2828
@override
2929
DartType buildAliasedType(

‎pkg/front_end/lib/src/builder/prefix_builder.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class PrefixBuilder extends BuilderImpl {
3535
final Uri fileUri;
3636

3737
@override
38-
final int charOffset;
38+
final int fileOffset;
3939

4040
final LoadLibraryBuilder? loadLibraryBuilder;
4141

@@ -45,7 +45,7 @@ class PrefixBuilder extends BuilderImpl {
4545
{required this.fileUri,
4646
required int prefixOffset,
4747
required int importOffset})
48-
: charOffset = prefixOffset,
48+
: fileOffset = prefixOffset,
4949
isWildcard = name == '_' {
5050
assert(deferred == (loadLibraryBuilder != null),
5151
"LoadLibraryBuilder must be provided iff prefix is deferred.");

‎pkg/front_end/lib/src/builder/type_alias_builder.dart

+6-6
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ abstract class TypeAliasBuilderImpl extends TypeDeclarationBuilderImpl
238238
// Coverage-ignore(suite): Not run.
239239
case ExtensionBuilder():
240240
unexpected(
241-
"type", "${rhsTypeDeclaration.runtimeType}", charOffset, fileUri);
241+
"type", "${rhsTypeDeclaration.runtimeType}", fileOffset, fileUri);
242242
}
243243
}
244244

@@ -259,7 +259,7 @@ abstract class TypeAliasBuilderImpl extends TypeDeclarationBuilderImpl
259259
// alias, which is ensured by the call to [_ensureUnaliasedType]
260260
// earlier.
261261
return unexpected(
262-
"unaliased", "${rhsDeclaration.runtimeType}", charOffset, fileUri);
262+
"unaliased", "${rhsDeclaration.runtimeType}", fileOffset, fileUri);
263263
case ClassBuilder():
264264
case ExtensionTypeDeclarationBuilder():
265265
case NominalVariableBuilder():
@@ -343,7 +343,7 @@ abstract class TypeAliasBuilderImpl extends TypeDeclarationBuilderImpl
343343
// Cyclic type alias.
344344
currentAliasBuilder.libraryBuilder.addProblem(
345345
templateCyclicTypedef.withArguments(this.name),
346-
charOffset,
346+
fileOffset,
347347
noLength,
348348
fileUri);
349349
// Ensure that it is not reported again.
@@ -367,7 +367,7 @@ abstract class TypeAliasBuilderImpl extends TypeDeclarationBuilderImpl
367367
typeVariable, const NullabilityBuilder.omitted(),
368368
arguments: const [],
369369
fileUri: fileUri,
370-
charOffset: charOffset,
370+
charOffset: fileOffset,
371371
instanceTypeVariableAccess:
372372
InstanceTypeVariableAccessState.Unexpected),
373373
];
@@ -388,7 +388,7 @@ abstract class TypeAliasBuilderImpl extends TypeDeclarationBuilderImpl
388388
usedAsClassFileUri,
389389
context: [
390390
messageTypedefTypeVariableNotConstructorCause.withLocation(
391-
current.fileUri!, current.charOffset, noLength),
391+
current.fileUri!, current.fileOffset, noLength),
392392
]);
393393
return this;
394394
}
@@ -447,7 +447,7 @@ abstract class TypeAliasBuilderImpl extends TypeDeclarationBuilderImpl
447447
previousAliasBuilder.libraryBuilder.addProblem(
448448
templateTypeArgumentMismatch.withArguments(
449449
currentAliasBuilder.typeVariables?.length ?? 0),
450-
previousAliasBuilder.charOffset,
450+
previousAliasBuilder.fileOffset,
451451
noLength,
452452
previousAliasBuilder.fileUri);
453453
previousAliasBuilder.thisType = const InvalidType();

0 commit comments

Comments
 (0)