Skip to content

Commit 6f2d732

Browse files
srawlinsCommit Queue
authored andcommitted
analyzer: deprecate reportLintForToken; migrate all SDK callers
Change-Id: I23c5d3d3f7ee1657f17b3d507e1d4edf1afd65d2 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/424701 Commit-Queue: Samuel Rawlins <[email protected]> Reviewed-by: Konstantin Shcheglov <[email protected]>
1 parent b7cb6c3 commit 6f2d732

File tree

71 files changed

+120
-127
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

+120
-127
lines changed

pkg/analyzer/lib/src/lint/linter.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ abstract class LintRule {
359359
errorCode: errorCode,
360360
);
361361

362-
// TODO(srawlins): Deprecate this in favor of [reportToken].
362+
@Deprecated('Use reportAtToken')
363363
void reportLintForToken(
364364
Token token, {
365365
List<Object> arguments = const [],

pkg/analyzer/test/src/diagnostics/unignorable_ignore_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class _AvoidIntVisitor extends SimpleAstVisitor {
115115
@override
116116
void visitNamedType(NamedType node) {
117117
if (node.name2.lexeme == 'int') {
118-
rule.reportLintForToken(node.name2);
118+
rule.reportAtToken(node.name2);
119119
}
120120
}
121121
}

pkg/analyzer/test/src/lint/lint_rule_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ main() {
2626
);
2727
rule.reporter = reporter;
2828

29-
rule.reportLintForToken(
29+
rule.reportAtToken(
3030
SimpleToken(TokenType.SEMICOLON, 0),
3131
errorCode: customCode,
3232
);
@@ -40,7 +40,7 @@ main() {
4040
);
4141
rule.reporter = reporter;
4242

43-
rule.reportLintForToken(SimpleToken(TokenType.SEMICOLON, 0));
43+
rule.reportAtToken(SimpleToken(TokenType.SEMICOLON, 0));
4444
expect(reporter.code, rule.lintCode);
4545
});
4646
test('reportLint (custom)', () {

pkg/linter/lib/src/rules/always_declare_return_types.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class _Visitor extends SimpleAstVisitor<void> {
4242
@override
4343
void visitFunctionDeclaration(FunctionDeclaration node) {
4444
if (!node.isSetter && node.returnType == null && !node.isAugmentation) {
45-
rule.reportLintForToken(
45+
rule.reportAtToken(
4646
node.name,
4747
arguments: [node.name.lexeme],
4848
errorCode: LinterLintCode.always_declare_return_types_of_functions,
@@ -53,7 +53,7 @@ class _Visitor extends SimpleAstVisitor<void> {
5353
@override
5454
void visitFunctionTypeAlias(FunctionTypeAlias node) {
5555
if (node.returnType == null) {
56-
rule.reportLintForToken(
56+
rule.reportAtToken(
5757
node.name,
5858
arguments: [node.name.lexeme],
5959
errorCode: LinterLintCode.always_declare_return_types_of_functions,
@@ -75,7 +75,7 @@ class _Visitor extends SimpleAstVisitor<void> {
7575
}
7676
}
7777

78-
rule.reportLintForToken(
78+
rule.reportAtToken(
7979
node.name,
8080
arguments: [node.name.lexeme],
8181
errorCode: LinterLintCode.always_declare_return_types_of_methods,

pkg/linter/lib/src/rules/always_put_control_body_on_new_line.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class _Visitor extends SimpleAstVisitor<void> {
7171
var lineInfo = unit.lineInfo;
7272
if (lineInfo.getLocation(controlEnd).lineNumber ==
7373
lineInfo.getLocation(offsetFirstStatement).lineNumber) {
74-
rule.reportLintForToken(node.beginToken);
74+
rule.reportAtToken(node.beginToken);
7575
}
7676
}
7777
}

pkg/linter/lib/src/rules/always_put_required_named_parameters_first.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class _Visitor extends SimpleAstVisitor<void> {
4545
if (nonRequiredSeen) {
4646
var name = param.name;
4747
if (name != null) {
48-
rule.reportLintForToken(name);
48+
rule.reportAtToken(name);
4949
}
5050
}
5151
} else {

pkg/linter/lib/src/rules/always_specify_types.dart

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class _Visitor extends SimpleAstVisitor<void> {
5757

5858
void checkLiteral(TypedLiteral literal) {
5959
if (literal.typeArguments == null) {
60-
rule.reportLintForToken(
60+
rule.reportAtToken(
6161
literal.beginToken,
6262
errorCode: LinterLintCode.always_specify_types_add_type,
6363
);
@@ -71,13 +71,13 @@ class _Visitor extends SimpleAstVisitor<void> {
7171
var element = node.declaredElement2;
7272
if (element is VariableElement2) {
7373
if (keyword.keyword == Keyword.VAR) {
74-
rule.reportLintForToken(
74+
rule.reportAtToken(
7575
keyword,
7676
arguments: [keyword.lexeme, element!.type],
7777
errorCode: LinterLintCode.always_specify_types_replace_keyword,
7878
);
7979
} else {
80-
rule.reportLintForToken(
80+
rule.reportAtToken(
8181
keyword,
8282
arguments: [element!.type],
8383
errorCode: LinterLintCode.always_specify_types_specify_type,
@@ -94,13 +94,13 @@ class _Visitor extends SimpleAstVisitor<void> {
9494
var keyword = node.keyword;
9595
var tokenToLint = keyword ?? node.name;
9696
if (keyword != null && keyword.keyword == Keyword.VAR) {
97-
rule.reportLintForToken(
97+
rule.reportAtToken(
9898
tokenToLint,
9999
arguments: [keyword.lexeme, type],
100100
errorCode: LinterLintCode.always_specify_types_replace_keyword,
101101
);
102102
} else {
103-
rule.reportLintForToken(
103+
rule.reportAtToken(
104104
tokenToLint,
105105
arguments: [type],
106106
errorCode: LinterLintCode.always_specify_types_specify_type,
@@ -147,13 +147,13 @@ class _Visitor extends SimpleAstVisitor<void> {
147147
if (keyword.type == Keyword.VAR &&
148148
type != null &&
149149
type is! DynamicType) {
150-
rule.reportLintForToken(
150+
rule.reportAtToken(
151151
keyword,
152152
arguments: [keyword.lexeme, type],
153153
errorCode: LinterLintCode.always_specify_types_replace_keyword,
154154
);
155155
} else {
156-
rule.reportLintForToken(
156+
rule.reportAtToken(
157157
keyword,
158158
errorCode: LinterLintCode.always_specify_types_add_type,
159159
);
@@ -217,11 +217,7 @@ class _Visitor extends SimpleAstVisitor<void> {
217217
errorCode = LinterLintCode.always_specify_types_add_type;
218218
}
219219
}
220-
rule.reportLintForToken(
221-
keyword,
222-
arguments: arguments,
223-
errorCode: errorCode,
224-
);
220+
rule.reportAtToken(keyword, arguments: arguments, errorCode: errorCode);
225221
}
226222
}
227223

pkg/linter/lib/src/rules/analyzer_use_new_elements.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ class _Visitor extends SimpleAstVisitor<void> {
147147
}
148148

149149
if (_isOldModelElement(node.element2)) {
150-
rule.reportLintForToken(node.name2);
150+
rule.reportAtToken(node.name2);
151151
}
152152
}
153153

pkg/linter/lib/src/rules/annotate_overrides.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class _Visitor extends SimpleAstVisitor<void> {
4242

4343
var member = context.inheritanceManager.overriddenMember(element);
4444
if (member != null) {
45-
rule.reportLintForToken(target, arguments: [member.name3!]);
45+
rule.reportAtToken(target, arguments: [member.name3!]);
4646
}
4747
}
4848

pkg/linter/lib/src/rules/annotate_redeclares.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class _Visitor extends SimpleAstVisitor<void> {
5656
if (extensionType == null) return;
5757

5858
if (_redeclaresMember(element, extensionType)) {
59-
rule.reportLintForToken(node.name, arguments: [element.displayName]);
59+
rule.reportAtToken(node.name, arguments: [element.displayName]);
6060
}
6161
}
6262

0 commit comments

Comments
 (0)