Check tool folder for problems
Also, complain about "deprecated" without underscore, as used,
for example, in pkg/front_end/tool/_fasta/command_line.dart.
Change-Id: Ica3b49a9d91c1176ec3bab5de6fd6811d38f69af
Reviewed-on: https://dart-review.googlesource.com/63080
Reviewed-by: Aske Simon Christensen <askesc@google.com>
diff --git a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
index cfa051e..e5fb5f6 100644
--- a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
@@ -1341,7 +1341,8 @@
void handleIdentifier(Token token, IdentifierContext context) {
debugEvent("handleIdentifier");
String name = token.lexeme;
- if (name.startsWith("deprecated_")) {
+ if (name.startsWith("deprecated") &&
+ (name == "deprecated" || name.startsWith("deprecated_"))) {
addProblem(fasta.templateUseOfDeprecatedIdentifier.withArguments(name),
offsetForToken(token), lengthForToken(token));
}
diff --git a/pkg/front_end/lib/src/fasta/rewrite_severity.dart b/pkg/front_end/lib/src/fasta/rewrite_severity.dart
index fafdd23..4d7b0e7 100644
--- a/pkg/front_end/lib/src/fasta/rewrite_severity.dart
+++ b/pkg/front_end/lib/src/fasta/rewrite_severity.dart
@@ -10,9 +10,13 @@
Severity severity, msg.Code<Object> code, Uri fileUri) {
if (severity != Severity.ignored) return severity;
String path = fileUri.path;
- const String fastaPath = "/pkg/front_end/lib/src/fasta/";
+ String fastaPath = "/pkg/front_end/lib/src/fasta/";
int index = path.indexOf(fastaPath);
- if (index == -1) return severity;
+ if (index == -1) {
+ fastaPath = "/pkg/front_end/tool/_fasta/";
+ index = path.indexOf(fastaPath);
+ if (index == -1) return severity;
+ }
if (code == msg.codeUseOfDeprecatedIdentifier) {
// TODO(ahe): Remove the exceptions below.
// We plan to remove all uses of deprecated identifiers from Fasta. The
@@ -21,8 +25,10 @@
// below and compile Fasta with itself to get a list of remaining call
// sites.
switch (path.substring(fastaPath.length + index)) {
+ case "command_line.dart":
case "command_line_reporting.dart":
case "deprecated_problems.dart":
+ case "entry_points.dart":
case "kernel/body_builder.dart":
case "kernel/expression_generator.dart":
case "kernel/kernel_expression_generator.dart":
@@ -71,6 +77,7 @@
case "dill/dill_loader.dart":
case "dill/dill_target.dart":
case "dill/dill_typedef_builder.dart":
+ case "entry_points.dart":
case "export.dart":
case "fasta_codes.dart":
case "import.dart":
