Skip to content

Commit 87f5185

Browse files
srawlinsCommit Queue
authored andcommitted
analyzer: Rename NodeLintRegistry to RuleVisitorRegistry, provide alias
Work towards #50986 Change-Id: Id0053b4721ca0517e315d5118ae48839dfaa3027 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429465 Reviewed-by: Konstantin Shcheglov <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]>
1 parent 66a2833 commit 87f5185

File tree

9 files changed

+22
-14
lines changed

9 files changed

+22
-14
lines changed

pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ class BulkFixProcessor {
534534
LintRuleUnitContext currentUnit,
535535
List<LintRuleUnitContext> allUnits,
536536
) {
537-
var nodeRegistry = NodeLintRegistry(enableTiming: false);
537+
var nodeRegistry = RuleVisitorRegistry(enableTiming: false);
538538
var context = LinterContextWithParsedResults(allUnits, currentUnit);
539539
var lintRules =
540540
_syntacticLintCodes

pkg/analysis_server_plugin/lib/src/plugin_server.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ class PluginServer {
339339

340340
// TODO(srawlins): Enable timing similar to what the linter package's
341341
// `benchhmark.dart` script does.
342-
var nodeRegistry = NodeLintRegistry(enableTiming: false);
342+
var nodeRegistry = RuleVisitorRegistry(enableTiming: false);
343343

344344
var context = LinterContextWithResolvedResults(
345345
allUnits,

pkg/analysis_server_plugin/test/src/lint_rules.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:analyzer/dart/ast/ast.dart';
66
import 'package:analyzer/dart/ast/visitor.dart';
77
import 'package:analyzer/error/error.dart';
88
import 'package:analyzer/src/lint/linter.dart';
9+
import 'package:analyzer/src/lint/linter_visitor.dart';
910

1011
class NoBoolsRule extends AnalysisRule {
1112
static const LintCode code = LintCode('no_bools', 'No bools message');
@@ -17,7 +18,7 @@ class NoBoolsRule extends AnalysisRule {
1718

1819
@override
1920
void registerNodeProcessors(
20-
NodeLintRegistry registry, LinterContext context) {
21+
RuleVisitorRegistry registry, LinterContext context) {
2122
var visitor = _NoBoolsVisitor(this);
2223
registry.addBooleanLiteral(this, visitor);
2324
}
@@ -34,7 +35,7 @@ class NoDoublesRule extends AnalysisRule {
3435

3536
@override
3637
void registerNodeProcessors(
37-
NodeLintRegistry registry, LinterContext context) {
38+
RuleVisitorRegistry registry, LinterContext context) {
3839
var visitor = _NoDoublesVisitor(this);
3940
registry.addDoubleLiteral(this, visitor);
4041
}

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
@@ -12,6 +12,7 @@ import 'package:analyzer/dart/ast/ast.dart';
1212
import 'package:analyzer/dart/ast/visitor.dart';
1313
import 'package:analyzer/error/error.dart';
1414
import 'package:analyzer/src/lint/linter.dart';
15+
import 'package:analyzer/src/lint/linter_visitor.dart';
1516
import 'package:analyzer_plugin/protocol/protocol_constants.dart' as protocol;
1617
import 'package:analyzer_plugin/protocol/protocol_generated.dart' as protocol;
1718
import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
@@ -269,7 +270,7 @@ class _ThrowsAsyncErrorRule extends AnalysisRule {
269270

270271
@override
271272
void registerNodeProcessors(
272-
NodeLintRegistry registry, LinterContext context) {
273+
RuleVisitorRegistry registry, LinterContext context) {
273274
var visitor = _ThrowsAsyncErrorVisitor(this);
274275
registry.addBooleanLiteral(this, visitor);
275276
}
@@ -316,7 +317,7 @@ class _ThrowsSyncErrorRule extends AnalysisRule {
316317

317318
@override
318319
void registerNodeProcessors(
319-
NodeLintRegistry registry, LinterContext context) {
320+
RuleVisitorRegistry registry, LinterContext context) {
320321
var visitor = _ThrowsSyncErrorVisitor(this);
321322
registry.addBooleanLiteral(this, visitor);
322323
}

pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ class LibraryAnalyzer {
402402
var allUnits = analysesToContextUnits.values.toList();
403403
definingContextUnit ??= allUnits.first;
404404

405-
var nodeRegistry = NodeLintRegistry(enableTiming: _enableLintRuleTiming);
405+
var nodeRegistry = RuleVisitorRegistry(enableTiming: _enableLintRuleTiming);
406406
var context = LinterContextWithResolvedResults(
407407
allUnits,
408408
definingContextUnit,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import 'package:analyzer/diagnostic/diagnostic.dart';
1313
import 'package:analyzer/error/error.dart';
1414
import 'package:analyzer/error/listener.dart';
1515
import 'package:analyzer/file_system/file_system.dart';
16-
import 'package:analyzer/src/lint/linter_visitor.dart' show NodeLintRegistry;
16+
import 'package:analyzer/src/lint/linter_visitor.dart' show RuleVisitorRegistry;
1717
import 'package:analyzer/src/lint/pub.dart';
1818
import 'package:analyzer/src/lint/state.dart';
1919
import 'package:analyzer/workspace/workspace.dart';
@@ -75,7 +75,7 @@ sealed class AbstractAnalysisRule {
7575
/// The node processors may use the provided [context] to access information
7676
/// that is not available from the AST nodes or their associated elements.
7777
void registerNodeProcessors(
78-
NodeLintRegistry registry,
78+
RuleVisitorRegistry registry,
7979
LinterContext context,
8080
) {}
8181

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ import 'package:analyzer/src/generated/engine.dart';
88
import 'package:analyzer/src/lint/analysis_rule_timers.dart';
99
import 'package:analyzer/src/lint/linter.dart';
1010

11+
/// The soon-to-be-deprecated alias for a [RuleVisitorRegistry].
12+
typedef NodeLintRegistry = RuleVisitorRegistry;
13+
1114
/// The AST visitor that runs handlers for nodes from the [_registry].
1215
class AnalysisRuleVisitor implements AstVisitor<void> {
13-
final NodeLintRegistry _registry;
16+
final RuleVisitorRegistry _registry;
1417

1518
/// Whether exceptions should be propagated (by rethrowing them).
1619
final bool _shouldPropagateExceptions;
@@ -1142,7 +1145,7 @@ class AnalysisRuleVisitor implements AstVisitor<void> {
11421145
}
11431146

11441147
/// The container to register visitors for separate AST node types.
1145-
class NodeLintRegistry {
1148+
class RuleVisitorRegistry {
11461149
final bool _enableTiming;
11471150
final List<_AfterLibrarySubscription> _afterLibrary = [];
11481151
final List<_Subscription<AdjacentStrings>> _forAdjacentStrings = [];
@@ -1360,7 +1363,8 @@ class NodeLintRegistry {
13601363
final List<_Subscription<WithClause>> _forWithClause = [];
13611364
final List<_Subscription<YieldStatement>> _forYieldStatement = [];
13621365

1363-
NodeLintRegistry({required bool enableTiming}) : _enableTiming = enableTiming;
1366+
RuleVisitorRegistry({required bool enableTiming})
1367+
: _enableTiming = enableTiming;
13641368

13651369
void addAdjacentStrings(AbstractAnalysisRule rule, AstVisitor visitor) {
13661370
_forAdjacentStrings.add(_Subscription(rule, visitor, _getTimer(rule)));

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import 'package:analyzer/src/dart/element/element.dart';
2020
import 'package:analyzer/src/error/codes.dart';
2121
import 'package:analyzer/src/fine/requirements.dart';
2222
import 'package:analyzer/src/lint/linter.dart';
23+
import 'package:analyzer/src/lint/linter_visitor.dart';
2324
import 'package:analyzer/src/test_utilities/lint_registration_mixin.dart';
2425
import 'package:analyzer/src/utilities/extensions/async.dart';
2526
import 'package:analyzer/utilities/package_config_file_builder.dart';
@@ -43487,7 +43488,7 @@ class _AlwaysReportedLint extends LintRule {
4348743488

4348843489
@override
4348943490
void registerNodeProcessors(
43490-
NodeLintRegistry registry,
43491+
RuleVisitorRegistry registry,
4349143492
LinterContext context,
4349243493
) {
4349343494
var visitor = _AlwaysReportedLintVisitor(this);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'package:analyzer/dart/ast/visitor.dart';
77
import 'package:analyzer/error/error.dart';
88
import 'package:analyzer/src/error/codes.dart';
99
import 'package:analyzer/src/lint/linter.dart';
10+
import 'package:analyzer/src/lint/linter_visitor.dart';
1011
import 'package:analyzer/src/test_utilities/lint_registration_mixin.dart';
1112
import 'package:analyzer_testing/utilities/utilities.dart';
1213
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -100,7 +101,7 @@ class _AvoidIntRule extends LintRule {
100101

101102
@override
102103
void registerNodeProcessors(
103-
NodeLintRegistry registry,
104+
RuleVisitorRegistry registry,
104105
LinterContext context,
105106
) {
106107
var visitor = _AvoidIntVisitor(this);

0 commit comments

Comments
 (0)