Skip to content

Commit 959470b

Browse files
peter-ahe-googlepeter-ahe-google
committed
Remove deprecated_warning.
[email protected] Review-Url: https://codereview.chromium.org/2980823002 .
1 parent 17dc720 commit 959470b

File tree

6 files changed

+122
-38
lines changed

6 files changed

+122
-38
lines changed

‎pkg/front_end/lib/src/fasta/fasta_codes_generated.dart

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2295,6 +2295,91 @@ const MessageCode messageSuperNullAware = const MessageCode("SuperNullAware",
22952295
message: r"""'super' can't be null.""",
22962296
tip: r"""Try replacing '?.' with '.'""");
22972297

2298+
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
2299+
const Template<Message Function(String name)> templateSuperclassHasNoGetter =
2300+
const Template<Message Function(String name)>(
2301+
messageTemplate: r"""Superclass has no getter named '#name'.""",
2302+
withArguments: _withArgumentsSuperclassHasNoGetter);
2303+
2304+
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
2305+
const Code<Message Function(String name)> codeSuperclassHasNoGetter =
2306+
const Code<Message Function(String name)>(
2307+
"SuperclassHasNoGetter",
2308+
templateSuperclassHasNoGetter,
2309+
);
2310+
2311+
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
2312+
Message _withArgumentsSuperclassHasNoGetter(String name) {
2313+
return new Message(codeSuperclassHasNoGetter,
2314+
message: """Superclass has no getter named '$name'.""",
2315+
arguments: {'name': name});
2316+
}
2317+
2318+
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
2319+
const Template<Message Function(String name)> templateSuperclassHasNoMethod =
2320+
const Template<Message Function(String name)>(
2321+
messageTemplate: r"""Superclass has no method named '#name'.""",
2322+
withArguments: _withArgumentsSuperclassHasNoMethod);
2323+
2324+
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
2325+
const Code<Message Function(String name)> codeSuperclassHasNoMethod =
2326+
const Code<Message Function(String name)>(
2327+
"SuperclassHasNoMethod",
2328+
templateSuperclassHasNoMethod,
2329+
);
2330+
2331+
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
2332+
Message _withArgumentsSuperclassHasNoMethod(String name) {
2333+
return new Message(codeSuperclassHasNoMethod,
2334+
message: """Superclass has no method named '$name'.""",
2335+
arguments: {'name': name});
2336+
}
2337+
2338+
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
2339+
const Template<Message Function(String name)> templateSuperclassHasNoSetter =
2340+
const Template<Message Function(String name)>(
2341+
messageTemplate: r"""Superclass has no setter named '#name'.""",
2342+
withArguments: _withArgumentsSuperclassHasNoSetter);
2343+
2344+
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
2345+
const Code<Message Function(String name)> codeSuperclassHasNoSetter =
2346+
const Code<Message Function(String name)>(
2347+
"SuperclassHasNoSetter",
2348+
templateSuperclassHasNoSetter,
2349+
);
2350+
2351+
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
2352+
Message _withArgumentsSuperclassHasNoSetter(String name) {
2353+
return new Message(codeSuperclassHasNoSetter,
2354+
message: """Superclass has no setter named '$name'.""",
2355+
arguments: {'name': name});
2356+
}
2357+
2358+
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
2359+
const Template<
2360+
Message Function(
2361+
String
2362+
name)> templateSuperclassMethodArgumentMismatch = const Template<
2363+
Message Function(String name)>(
2364+
messageTemplate:
2365+
r"""Superclass doesn't have a method named '#name' with matching arguments.""",
2366+
withArguments: _withArgumentsSuperclassMethodArgumentMismatch);
2367+
2368+
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
2369+
const Code<Message Function(String name)> codeSuperclassMethodArgumentMismatch =
2370+
const Code<Message Function(String name)>(
2371+
"SuperclassMethodArgumentMismatch",
2372+
templateSuperclassMethodArgumentMismatch,
2373+
);
2374+
2375+
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
2376+
Message _withArgumentsSuperclassMethodArgumentMismatch(String name) {
2377+
return new Message(codeSuperclassMethodArgumentMismatch,
2378+
message:
2379+
"""Superclass doesn't have a method named '$name' with matching arguments.""",
2380+
arguments: {'name': name});
2381+
}
2382+
22982383
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
22992384
const Code<Null> codeSupertypeIsFunction = messageSupertypeIsFunction;
23002385

@@ -2471,6 +2556,15 @@ Message _withArgumentsTypeVariableDuplicatedNameCause(String name) {
24712556
arguments: {'name': name});
24722557
}
24732558

2559+
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
2560+
const Code<Null> codeTypeVariableInStaticContext =
2561+
messageTypeVariableInStaticContext;
2562+
2563+
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
2564+
const MessageCode messageTypeVariableInStaticContext = const MessageCode(
2565+
"TypeVariableInStaticContext",
2566+
message: r"""Type variables can't be used in static members.""");
2567+
24742568
// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
24752569
const Code<Null> codeTypeVariableSameNameAsEnclosing =
24762570
messageTypeVariableSameNameAsEnclosing;

‎pkg/front_end/lib/src/fasta/kernel/body_builder.dart

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -915,9 +915,9 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper {
915915
warnUnresolvedSuperMethod(node.name, node.fileOffset);
916916
} else if (!areArgumentsCompatible(target.function, node.arguments)) {
917917
target = null;
918-
deprecated_warning(
919-
"Super class doesn't have a method named '${node.name.name}' "
920-
"with matching arguments.",
918+
warning(
919+
fasta.templateSuperclassMethodArgumentMismatch
920+
.withArguments(node.name.name),
921921
node.fileOffset);
922922
}
923923
Expression result;
@@ -987,20 +987,20 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper {
987987

988988
@override
989989
void warnUnresolvedSuperGet(Name name, int charOffset) {
990-
deprecated_warning(
991-
"Super class has no getter named '${name.name}'.", charOffset);
990+
warning(fasta.templateSuperclassHasNoGetter.withArguments(name.name),
991+
charOffset);
992992
}
993993

994994
@override
995995
void warnUnresolvedSuperSet(Name name, int charOffset) {
996-
deprecated_warning(
997-
"Super class has no setter named '${name.name}'.", charOffset);
996+
warning(fasta.templateSuperclassHasNoSetter.withArguments(name.name),
997+
charOffset);
998998
}
999999

10001000
@override
10011001
void warnUnresolvedSuperMethod(Name name, int charOffset) {
1002-
deprecated_warning(
1003-
"Super class has no method named '${name.name}'.", charOffset);
1002+
warning(fasta.templateSuperclassHasNoMethod.withArguments(name.name),
1003+
charOffset);
10041004
}
10051005

10061006
@override
@@ -1635,7 +1635,7 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper {
16351635
String name, List<DartType> arguments, int charOffset) {
16361636
Builder builder = scope.lookup(name, charOffset, uri);
16371637
if (builder == null) {
1638-
deprecated_warning("Type not found: '$name'.", charOffset);
1638+
warning(fasta.templateTypeNotFound.withArguments(name), charOffset);
16391639
return const InvalidType();
16401640
} else {
16411641
return kernelTypeFromBuilder(builder, arguments, charOffset);
@@ -3274,15 +3274,6 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper {
32743274
}
32753275
}
32763276

3277-
@override
3278-
void deprecated_warning(String message, [int charOffset = -1]) {
3279-
if (constantExpressionRequired) {
3280-
deprecated_addCompileTimeError(charOffset, message);
3281-
} else {
3282-
super.deprecated_warning(message, charOffset);
3283-
}
3284-
}
3285-
32863277
void warningNotError(Message message, int charOffset) {
32873278
super.warning(message, charOffset);
32883279
}
@@ -3291,11 +3282,11 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper {
32913282
DartType validatedTypeVariableUse(
32923283
TypeParameterType type, int offset, bool nonInstanceAccessIsError) {
32933284
if (!isInstanceContext && type.parameter.parent is Class) {
3294-
String message = "Type variables can't be used in static members.";
3285+
Message message = fasta.messageTypeVariableInStaticContext;
32953286
if (nonInstanceAccessIsError) {
3296-
deprecated_addCompileTimeError(offset, message);
3287+
addCompileTimeError(message, offset);
32973288
} else {
3298-
deprecated_warning(message, offset);
3289+
warning(message, offset);
32993290
}
33003291
return const InvalidType();
33013292
} else if (constantExpressionRequired) {

‎pkg/front_end/lib/src/fasta/kernel/fasta_accessors.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,6 @@ abstract class BuilderHelper {
125125

126126
void warning(Message message, int charOffset);
127127

128-
void deprecated_warning(String message, [int charOffset]);
129-
130128
void warnUnresolvedSuperGet(Name name, int charOffset);
131129

132130
void warnUnresolvedSuperSet(Name name, int charOffset);

‎pkg/front_end/lib/src/fasta/messages.dart

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,6 @@ void nit(Message message, int charOffset, Uri uri) {
5858
}
5959
}
6060

61-
void deprecated_warning(Uri uri, int charOffset, String message) {
62-
if (hideWarnings) return;
63-
print(deprecated_format(uri, charOffset, colorWarning("Warning: $message")));
64-
if (warningsAreFatal) {
65-
if (isVerbose) print(StackTrace.current);
66-
throw new deprecated_InputError(
67-
uri, charOffset, "Compilation aborted due to fatal warnings.");
68-
}
69-
}
70-
7161
String colorWarning(String message) {
7262
// TODO(ahe): Colors need to be optional. Doesn't work well in Emacs or on
7363
// Windows.

‎pkg/front_end/lib/src/fasta/source/stack_listener.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,10 +276,6 @@ abstract class StackListener extends Listener {
276276
messages.nit(message, charOffset, uri);
277277
}
278278

279-
void deprecated_warning(String message, [int charOffset = -1]) {
280-
messages.deprecated_warning(uri, charOffset, message);
281-
}
282-
283279
void warning(Message message, int charOffset) {
284280
messages.warning(message, charOffset, uri);
285281
}

‎pkg/front_end/messages.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -816,3 +816,18 @@ FinalInstanceVariableAlreadyInitialized:
816816

817817
FinalInstanceVariableAlreadyInitializedCause:
818818
template: "'#name' was initialized here."
819+
820+
TypeVariableInStaticContext:
821+
template: "Type variables can't be used in static members."
822+
823+
SuperclassMethodArgumentMismatch:
824+
template: "Superclass doesn't have a method named '#name' with matching arguments."
825+
826+
SuperclassHasNoGetter:
827+
template: "Superclass has no getter named '#name'."
828+
829+
SuperclassHasNoSetter:
830+
template: "Superclass has no setter named '#name'."
831+
832+
SuperclassHasNoMethod:
833+
template: "Superclass has no method named '#name'."

0 commit comments

Comments
 (0)