Skip to content

Commit 579ad24

Browse files
stereotype441Commit Queue
stereotype441
authored and
Commit Queue
committed
[front_end] Rename withArguments to withArgumentsOld.
This is the beginning of a series of CLs intended to change the CFE's `withArguments` methods (used for diagnostic reporting) so that they accept named parameters rather than positional parameters. This change will carry two major benefits: - It will reduce the risk of mistakes when reporting diagnostics. - It will make the analyzer and CFE diagnostic reporting mechanisms more similar, paving the way for sharing more diagnostic reporting code in the future. As a first step, this CL renames the old `withArguments` methods to `withArgumentsOld` and updates call sites. In follow-up CLs, I will introduce new `withArguments` methods that accept named arguments, and migrate call sites to use them. Change-Id: I6a6a6964f4130cdb732b14d515e0ad8f2b65dc26 Tested: standard trybots Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/447625 Reviewed-by: Stephen Adams <[email protected]> Reviewed-by: Ryan Macnak <[email protected]> Reviewed-by: Johnni Winther <[email protected]> Commit-Queue: Paul Berry <[email protected]>
1 parent 26102c5 commit 579ad24

File tree

89 files changed

+2081
-1829
lines changed

Some content is hidden

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

89 files changed

+2081
-1829
lines changed

‎pkg/_fe_analyzer_shared/lib/src/experiments/errors.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import 'flags.dart';
99
/// enabled.
1010
Message getExperimentNotEnabledMessage(ExperimentalFlag experimentalFlag) {
1111
if (experimentalFlag.isEnabledByDefault) {
12-
return codeExperimentNotEnabled.withArguments(
12+
return codeExperimentNotEnabled.withArgumentsOld(
1313
experimentalFlag.name,
1414
experimentalFlag.experimentEnabledVersion.toText(),
1515
);
1616
} else {
17-
return codeExperimentNotEnabledOffByDefault.withArguments(
17+
return codeExperimentNotEnabledOffByDefault.withArgumentsOld(
1818
experimentalFlag.name,
1919
);
2020
}

‎pkg/_fe_analyzer_shared/lib/src/messages/codes.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,13 @@ class Template<T> extends Code {
111111

112112
final String? correctionMessageTemplate;
113113

114-
final T withArguments;
114+
final T withArgumentsOld;
115115

116116
const Template(
117117
super.name, {
118118
this.correctionMessageTemplate,
119119
required this.problemMessageTemplate,
120-
required this.withArguments,
120+
required this.withArgumentsOld,
121121
super.index = -1,
122122
super.analyzerCodes,
123123
super.severity = CfeSeverity.error,

‎pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart‎

Lines changed: 837 additions & 751 deletions
Large diffs are not rendered by default.

‎pkg/_fe_analyzer_shared/lib/src/parser/identifier_context_impl.dart‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class ClassOrMixinOrExtensionIdentifierContext extends IdentifierContext {
8787
identifier = parser.insertSyntheticIdentifier(
8888
token,
8989
this,
90-
message: codes.codeExpectedIdentifier.withArguments(identifier),
90+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
9191
);
9292
} else if (identifier.type.isBuiltIn) {
9393
parser.reportRecoverableErrorWithToken(
@@ -149,15 +149,15 @@ class CombinatorIdentifierContext extends IdentifierContext {
149149
identifier = parser.insertSyntheticIdentifier(
150150
token,
151151
this,
152-
message: codes.codeExpectedIdentifier.withArguments(identifier),
152+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
153153
);
154154
} else if (looksLikeStartOfNextTopLevelDeclaration(identifier) &&
155155
(identifier.next == null ||
156156
!_isOneOfFollowingValues(identifier.next!))) {
157157
identifier = parser.insertSyntheticIdentifier(
158158
token,
159159
this,
160-
message: codes.codeExpectedIdentifier.withArguments(identifier),
160+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
161161
);
162162
} else {
163163
if (!identifier.isKeywordOrIdentifier) {
@@ -213,7 +213,7 @@ class ConstructorReferenceIdentifierContext extends IdentifierContext {
213213
identifier = parser.insertSyntheticIdentifier(
214214
token,
215215
this,
216-
message: codes.codeExpectedIdentifier.withArguments(identifier),
216+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
217217
);
218218
} else {
219219
// Use the keyword as the identifier.
@@ -262,7 +262,7 @@ class DottedNameIdentifierContext extends IdentifierContext {
262262
identifier = parser.insertSyntheticIdentifier(
263263
token,
264264
this,
265-
message: codes.codeExpectedIdentifier.withArguments(identifier),
265+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
266266
);
267267
} else {
268268
if (!identifier.isKeywordOrIdentifier) {
@@ -309,7 +309,7 @@ class EnumDeclarationIdentifierContext extends IdentifierContext {
309309
identifier = parser.insertSyntheticIdentifier(
310310
token,
311311
this,
312-
message: codes.codeExpectedIdentifier.withArguments(identifier),
312+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
313313
);
314314
} else if (identifier.type.isBuiltIn) {
315315
parser.reportRecoverableErrorWithToken(
@@ -496,7 +496,7 @@ class FieldDeclarationIdentifierContext extends IdentifierContext {
496496
return parser.insertSyntheticIdentifier(
497497
identifier,
498498
this,
499-
message: codes.codeExpectedIdentifier.withArguments(identifier),
499+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
500500
messageOnToken: identifier,
501501
);
502502
} else {
@@ -598,7 +598,7 @@ class FormalParameterDeclarationIdentifierContext extends IdentifierContext {
598598
identifier = parser.insertSyntheticIdentifier(
599599
token,
600600
this,
601-
message: codes.codeExpectedIdentifier.withArguments(identifier),
601+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
602602
);
603603
} else {
604604
if (!identifier.isKeywordOrIdentifier) {
@@ -656,7 +656,7 @@ class RecordFieldDeclarationIdentifierContext extends IdentifierContext {
656656
identifier = parser.insertSyntheticIdentifier(
657657
token,
658658
this,
659-
message: codes.codeExpectedIdentifier.withArguments(identifier),
659+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
660660
);
661661
} else {
662662
if (!identifier.isKeywordOrIdentifier) {
@@ -719,13 +719,13 @@ class ImportPrefixIdentifierContext extends IdentifierContext {
719719
identifier = parser.insertSyntheticIdentifier(
720720
token,
721721
this,
722-
message: codes.codeExpectedIdentifier.withArguments(identifier),
722+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
723723
);
724724
} else if (_isOneOfFollowingValues(identifier)) {
725725
identifier = parser.insertSyntheticIdentifier(
726726
token,
727727
this,
728-
message: codes.codeExpectedIdentifier.withArguments(identifier),
728+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
729729
);
730730
} else {
731731
if (!identifier.isKeywordOrIdentifier) {
@@ -768,7 +768,7 @@ class LiteralSymbolIdentifierContext extends IdentifierContext {
768768
identifier = parser.insertSyntheticIdentifier(
769769
token,
770770
this,
771-
message: codes.codeExpectedIdentifier.withArguments(identifier),
771+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
772772
);
773773
} else {
774774
// Use the keyword as the identifier.
@@ -814,7 +814,7 @@ class LocalFunctionDeclarationIdentifierContext extends IdentifierContext {
814814
identifier = parser.insertSyntheticIdentifier(
815815
token,
816816
this,
817-
message: codes.codeExpectedIdentifier.withArguments(identifier),
817+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
818818
);
819819
} else {
820820
if (!identifier.isKeywordOrIdentifier) {
@@ -858,7 +858,7 @@ class LabelDeclarationIdentifierContext extends IdentifierContext {
858858
identifier = parser.insertSyntheticIdentifier(
859859
token,
860860
this,
861-
message: codes.codeExpectedIdentifier.withArguments(identifier),
861+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
862862
);
863863
} else {
864864
if (!identifier.isKeywordOrIdentifier) {
@@ -899,7 +899,7 @@ class LabelReferenceIdentifierContext extends IdentifierContext {
899899
identifier = parser.insertSyntheticIdentifier(
900900
token,
901901
this,
902-
message: codes.codeExpectedIdentifier.withArguments(identifier),
902+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
903903
);
904904
} else {
905905
if (!identifier.isKeywordOrIdentifier) {
@@ -974,15 +974,15 @@ class LibraryIdentifierContext extends IdentifierContext {
974974
identifier = parser.insertSyntheticIdentifier(
975975
token,
976976
this,
977-
message: codes.codeExpectedIdentifier.withArguments(identifier),
977+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
978978
);
979979
} else if (looksLikeStartOfNextTopLevelDeclaration(identifier) &&
980980
(identifier.next == null ||
981981
!_isOneOfFollowingValues(identifier.next!))) {
982982
identifier = parser.insertSyntheticIdentifier(
983983
token,
984984
this,
985-
message: codes.codeExpectedIdentifier.withArguments(identifier),
985+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
986986
);
987987
} else {
988988
if (!identifier.isKeywordOrIdentifier) {
@@ -1031,7 +1031,7 @@ class LocalVariableDeclarationIdentifierContext extends IdentifierContext {
10311031
identifier = parser.insertSyntheticIdentifier(
10321032
token,
10331033
this,
1034-
message: codes.codeExpectedIdentifier.withArguments(identifier),
1034+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
10351035
);
10361036
} else {
10371037
if (!identifier.isKeywordOrIdentifier) {
@@ -1089,7 +1089,7 @@ class MetadataReferenceIdentifierContext extends IdentifierContext {
10891089
identifier = parser.insertSyntheticIdentifier(
10901090
token,
10911091
this,
1092-
message: codes.codeExpectedIdentifier.withArguments(identifier),
1092+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
10931093
);
10941094
} else {
10951095
if (!identifier.isKeywordOrIdentifier) {
@@ -1173,7 +1173,7 @@ class MethodDeclarationIdentifierContext extends IdentifierContext {
11731173
return parser.insertSyntheticIdentifier(
11741174
identifier,
11751175
this,
1176-
message: codes.codeExpectedIdentifier.withArguments(identifier),
1176+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
11771177
messageOnToken: identifier,
11781178
);
11791179
} else {
@@ -1231,7 +1231,7 @@ class NamedArgumentReferenceIdentifierContext extends IdentifierContext {
12311231
identifier = parser.insertSyntheticIdentifier(
12321232
token,
12331233
this,
1234-
message: codes.codeExpectedIdentifier.withArguments(identifier),
1234+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
12351235
);
12361236
} else {
12371237
if (!identifier.isKeywordOrIdentifier) {
@@ -1276,7 +1276,7 @@ class NamedRecordFieldReferenceIdentifierContext extends IdentifierContext {
12761276
identifier = parser.insertSyntheticIdentifier(
12771277
token,
12781278
this,
1279-
message: codes.codeExpectedIdentifier.withArguments(identifier),
1279+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
12801280
);
12811281
} else {
12821282
if (!identifier.isKeywordOrIdentifier) {
@@ -1329,7 +1329,7 @@ class TopLevelDeclarationIdentifierContext extends IdentifierContext {
13291329
identifier = parser.insertSyntheticIdentifier(
13301330
token,
13311331
this,
1332-
message: codes.codeExpectedIdentifier.withArguments(identifier),
1332+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
13331333
);
13341334
} else if (identifier.type.isBuiltIn) {
13351335
parser.reportRecoverableErrorWithToken(
@@ -1430,7 +1430,7 @@ class TypedefDeclarationIdentifierContext extends IdentifierContext {
14301430
identifier = parser.insertSyntheticIdentifier(
14311431
token,
14321432
this,
1433-
message: codes.codeExpectedIdentifier.withArguments(identifier),
1433+
message: codes.codeExpectedIdentifier.withArgumentsOld(identifier),
14341434
);
14351435
} else {
14361436
if (!identifier.isKeywordOrIdentifier) {

‎pkg/_fe_analyzer_shared/lib/src/parser/modifier_context.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ class ModifierContext {
655655
void reportConflictingModifiers(Token modifier, Token earlierModifier) {
656656
parser.reportRecoverableError(
657657
modifier,
658-
codes.codeConflictingModifiers.withArguments(
658+
codes.codeConflictingModifiers.withArgumentsOld(
659659
modifier.lexeme,
660660
earlierModifier.lexeme,
661661
),
@@ -729,7 +729,7 @@ class ModifierContext {
729729
void reportModifierOutOfOrder(Token modifier, String beforeModifier) {
730730
parser.reportRecoverableError(
731731
modifier,
732-
codes.codeModifierOutOfOrder.withArguments(
732+
codes.codeModifierOutOfOrder.withArgumentsOld(
733733
modifier.lexeme,
734734
beforeModifier,
735735
),

0 commit comments

Comments
 (0)