Skip to content

Commit cb61cfa

Browse files
srawlinsCommit Queue
authored andcommitted
linter: Use RuleContext over the deprecated alias, LinterContext
Change-Id: I3df38b96a0cb7756a9dbfbffc80d50c4c73337ba Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/432723 Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
1 parent 147ba50 commit cb61cfa

File tree

240 files changed

+533
-1001
lines changed

Some content is hidden

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

240 files changed

+533
-1001
lines changed

pkg/analysis_server_plugin/test/src/lint_rules.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
import 'package:analyzer/analysis_rule/rule_context.dart';
56
import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
67
import 'package:analyzer/dart/ast/ast.dart';
78
import 'package:analyzer/dart/ast/visitor.dart';
@@ -18,7 +19,7 @@ class NoBoolsRule extends AnalysisRule {
1819

1920
@override
2021
void registerNodeProcessors(
21-
RuleVisitorRegistry registry, LinterContext context) {
22+
RuleVisitorRegistry registry, RuleContext context) {
2223
var visitor = _NoBoolsVisitor(this);
2324
registry.addBooleanLiteral(this, visitor);
2425
}
@@ -35,7 +36,7 @@ class NoDoublesRule extends AnalysisRule {
3536

3637
@override
3738
void registerNodeProcessors(
38-
RuleVisitorRegistry registry, LinterContext context) {
39+
RuleVisitorRegistry registry, RuleContext context) {
3940
var visitor = _NoDoublesVisitor(this);
4041
registry.addDoubleLiteral(this, visitor);
4142
}
@@ -55,8 +56,7 @@ class NoDoublesWarningRule extends AnalysisRule {
5556
DiagnosticCode get diagnosticCode => code;
5657

5758
@override
58-
void registerNodeProcessors(
59-
NodeLintRegistry registry, LinterContext context) {
59+
void registerNodeProcessors(NodeLintRegistry registry, RuleContext context) {
6060
var visitor = _NoDoublesVisitor(this);
6161
registry.addDoubleLiteral(this, visitor);
6262
}

pkg/analysis_server_plugin/test/src/plugin_server_error_test.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
88
import 'package:analysis_server_plugin/plugin.dart';
99
import 'package:analysis_server_plugin/registry.dart';
1010
import 'package:analysis_server_plugin/src/plugin_server.dart';
11+
import 'package:analyzer/analysis_rule/rule_context.dart';
1112
import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
1213
import 'package:analyzer/dart/ast/ast.dart';
1314
import 'package:analyzer/dart/ast/visitor.dart';
@@ -270,7 +271,7 @@ class _ThrowsAsyncErrorRule extends AnalysisRule {
270271

271272
@override
272273
void registerNodeProcessors(
273-
RuleVisitorRegistry registry, LinterContext context) {
274+
RuleVisitorRegistry registry, RuleContext context) {
274275
var visitor = _ThrowsAsyncErrorVisitor(this);
275276
registry.addBooleanLiteral(this, visitor);
276277
}
@@ -317,7 +318,7 @@ class _ThrowsSyncErrorRule extends AnalysisRule {
317318

318319
@override
319320
void registerNodeProcessors(
320-
RuleVisitorRegistry registry, LinterContext context) {
321+
RuleVisitorRegistry registry, RuleContext context) {
321322
var visitor = _ThrowsSyncErrorVisitor(this);
322323
registry.addBooleanLiteral(this, visitor);
323324
}

pkg/analyzer/test/src/dart/analysis/driver_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import 'dart:async';
66

7+
import 'package:analyzer/analysis_rule/rule_context.dart';
78
import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
89
import 'package:analyzer/dart/analysis/results.dart';
910
import 'package:analyzer/dart/ast/visitor.dart';
@@ -46947,7 +46948,7 @@ class _AlwaysReportedLint extends LintRule {
4694746948
@override
4694846949
void registerNodeProcessors(
4694946950
RuleVisitorRegistry registry,
46950-
LinterContext context,
46951+
RuleContext context,
4695146952
) {
4695246953
var visitor = _AlwaysReportedLintVisitor(this);
4695346954
registry.addCompilationUnit(this, visitor);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
import 'package:analyzer/analysis_rule/rule_context.dart';
56
import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
67
import 'package:analyzer/dart/ast/ast.dart';
78
import 'package:analyzer/dart/ast/visitor.dart';
@@ -102,7 +103,7 @@ class _AvoidIntRule extends LintRule {
102103
@override
103104
void registerNodeProcessors(
104105
RuleVisitorRegistry registry,
105-
LinterContext context,
106+
RuleContext context,
106107
) {
107108
var visitor = _AvoidIntVisitor(this);
108109
registry.addNamedType(this, visitor);

pkg/linter/lib/src/ast.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
/// Common AST helpers.
66
library;
77

8+
import 'package:analyzer/analysis_rule/rule_context.dart';
89
import 'package:analyzer/dart/ast/ast.dart';
910
import 'package:analyzer/dart/ast/syntactic_entity.dart';
1011
import 'package:analyzer/dart/ast/token.dart';
@@ -16,8 +17,6 @@ import 'package:analyzer/src/lint/constants.dart' // ignore: implementation_impo
1617
import 'package:analyzer/workspace/workspace.dart';
1718
import 'package:path/path.dart' as path;
1819

19-
import 'analyzer.dart';
20-
2120
final Set<String> _reservedWords = {
2221
for (var entry in Keyword.keywords.entries)
2322
if (entry.value.isReservedWord) entry.key,
@@ -54,7 +53,7 @@ Token? getFieldName(FieldDeclaration decl, String name) {
5453
/// minus and then an [IntegerLiteral]. If a [context] is provided,
5554
/// [SimpleIdentifier]s are evaluated as constants. For anything else,
5655
/// returns `null`.
57-
int? getIntValue(Expression expression, LinterContext? context) {
56+
int? getIntValue(Expression expression, RuleContext? context) {
5857
if (expression is PrefixExpression) {
5958
var operand = expression.operand;
6059
if (expression.operator.type != TokenType.MINUS) return null;
@@ -311,7 +310,7 @@ bool _checkForSimpleSetter(MethodDeclaration setter, Expression expression) {
311310

312311
int? _getIntValue(
313312
Expression expression,
314-
LinterContext? context, {
313+
RuleContext? context, {
315314
bool negated = false,
316315
}) {
317316
int? value;

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
import 'package:analyzer/analysis_rule/rule_context.dart';
56
import 'package:analyzer/dart/ast/ast.dart';
67
import 'package:analyzer/dart/ast/token.dart';
78
import 'package:analyzer/dart/ast/visitor.dart';
@@ -23,10 +24,7 @@ class AlwaysDeclareReturnTypes extends MultiAnalysisRule {
2324
];
2425

2526
@override
26-
void registerNodeProcessors(
27-
NodeLintRegistry registry,
28-
LinterContext context,
29-
) {
27+
void registerNodeProcessors(NodeLintRegistry registry, RuleContext context) {
3028
var visitor = _Visitor(this, context);
3129
registry.addFunctionDeclaration(this, visitor);
3230
registry.addFunctionTypeAlias(this, visitor);
@@ -36,7 +34,7 @@ class AlwaysDeclareReturnTypes extends MultiAnalysisRule {
3634

3735
class _Visitor extends SimpleAstVisitor<void> {
3836
final MultiAnalysisRule rule;
39-
final LinterContext context;
37+
final RuleContext context;
4038

4139
_Visitor(this.rule, this.context);
4240

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
import 'package:analyzer/analysis_rule/rule_context.dart';
56
import 'package:analyzer/dart/ast/ast.dart';
67
import 'package:analyzer/dart/ast/visitor.dart';
78
import 'package:analyzer/error/error.dart';
@@ -22,10 +23,7 @@ class AlwaysPutControlBodyOnNewLine extends LintRule {
2223
LinterLintCode.always_put_control_body_on_new_line;
2324

2425
@override
25-
void registerNodeProcessors(
26-
NodeLintRegistry registry,
27-
LinterContext context,
28-
) {
26+
void registerNodeProcessors(NodeLintRegistry registry, RuleContext context) {
2927
var visitor = _Visitor(this);
3028
registry.addDoStatement(this, visitor);
3129
registry.addForStatement(this, visitor);

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
import 'package:analyzer/analysis_rule/rule_context.dart';
56
import 'package:analyzer/dart/ast/ast.dart';
67
import 'package:analyzer/dart/ast/visitor.dart';
78
import 'package:analyzer/error/error.dart';
@@ -22,10 +23,7 @@ class AlwaysPutRequiredNamedParametersFirst extends LintRule {
2223
LinterLintCode.always_put_required_named_parameters_first;
2324

2425
@override
25-
void registerNodeProcessors(
26-
NodeLintRegistry registry,
27-
LinterContext context,
28-
) {
26+
void registerNodeProcessors(NodeLintRegistry registry, RuleContext context) {
2927
var visitor = _Visitor(this);
3028
registry.addFormalParameterList(this, visitor);
3129
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
import 'package:analyzer/analysis_rule/rule_context.dart';
56
import 'package:analyzer/dart/ast/ast.dart';
67
import 'package:analyzer/dart/ast/token.dart';
78
import 'package:analyzer/dart/ast/visitor.dart';
@@ -35,10 +36,7 @@ class AlwaysSpecifyTypes extends MultiAnalysisRule {
3536
];
3637

3738
@override
38-
void registerNodeProcessors(
39-
NodeLintRegistry registry,
40-
LinterContext context,
41-
) {
39+
void registerNodeProcessors(NodeLintRegistry registry, RuleContext context) {
4240
var visitor = _Visitor(this);
4341
registry.addDeclaredIdentifier(this, visitor);
4442
registry.addListLiteral(this, visitor);

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
import 'package:analyzer/analysis_rule/rule_context.dart';
56
import 'package:analyzer/dart/ast/ast.dart';
67
import 'package:analyzer/dart/ast/visitor.dart';
78
import 'package:analyzer/error/error.dart';
@@ -24,10 +25,7 @@ class AlwaysUsePackageImports extends LintRule {
2425
];
2526

2627
@override
27-
void registerNodeProcessors(
28-
NodeLintRegistry registry,
29-
LinterContext context,
30-
) {
28+
void registerNodeProcessors(NodeLintRegistry registry, RuleContext context) {
3129
// Relative paths from outside of the lib folder are handled by the
3230
// `avoid_relative_lib_imports` lint rule.
3331
if (!context.isInLibDir) return;

0 commit comments

Comments
 (0)