Skip to content

Commit a33ae0f

Browse files
pqCommit Queue
authored and
Commit Queue
committed
[CQ] unify featureSet access
Change-Id: I927f9c5d851907b732232f72590a7f65b8dfdbed Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/403266 Reviewed-by: Brian Wilkerson <[email protected]> Auto-Submit: Phil Quitslund <[email protected]> Commit-Queue: Brian Wilkerson <[email protected]>
1 parent 876752e commit a33ae0f

4 files changed

+16
-16
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ class AvoidRenamingMethodParameters extends LintRule {
3030
NodeLintRegistry registry, LinterContext context) {
3131
if (!context.isInLibDir) return;
3232

33-
var visitor =
34-
_Visitor(this, context.libraryElement2, context.inheritanceManager);
33+
var visitor = _Visitor(this, context);
3534
registry.addMethodDeclaration(this, visitor);
3635
}
3736
}
@@ -44,9 +43,10 @@ class _Visitor extends SimpleAstVisitor<void> {
4443

4544
final LintRule rule;
4645

47-
_Visitor(this.rule, LibraryElement2? library, this.inheritanceManager)
46+
_Visitor(this.rule, LinterContext context)
4847
: _wildCardVariablesEnabled =
49-
library?.featureSet.isEnabled(Feature.wildcard_variables) ?? false;
48+
context.isEnabled(Feature.wildcard_variables),
49+
inheritanceManager = context.inheritanceManager;
5050

5151
bool isWildcardIdentifier(String lexeme) =>
5252
_wildCardVariablesEnabled && lexeme == '_';

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import 'package:analyzer/dart/analysis/features.dart';
66
import 'package:analyzer/dart/ast/ast.dart';
77
import 'package:analyzer/dart/ast/visitor.dart';
8-
import 'package:analyzer/dart/element/element2.dart';
98

109
import '../analyzer.dart';
10+
import '../extensions.dart';
1111

1212
const _desc = r'Avoid shadowing type parameters.';
1313

@@ -24,7 +24,7 @@ class AvoidShadowingTypeParameters extends LintRule {
2424
@override
2525
void registerNodeProcessors(
2626
NodeLintRegistry registry, LinterContext context) {
27-
var visitor = _Visitor(this, context.libraryElement2);
27+
var visitor = _Visitor(this, context);
2828
registry.addFunctionDeclarationStatement(this, visitor);
2929
registry.addGenericTypeAlias(this, visitor);
3030
registry.addMethodDeclaration(this, visitor);
@@ -37,9 +37,9 @@ class _Visitor extends SimpleAstVisitor<void> {
3737

3838
final LintRule rule;
3939

40-
_Visitor(this.rule, LibraryElement2? library)
40+
_Visitor(this.rule, LinterContext context)
4141
: _wildCardVariablesEnabled =
42-
library?.featureSet.isEnabled(Feature.wildcard_variables) ?? false;
42+
context.isEnabled(Feature.wildcard_variables);
4343

4444
@override
4545
void visitFunctionDeclarationStatement(FunctionDeclarationStatement node) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import 'package:analyzer/dart/analysis/features.dart';
66
import 'package:analyzer/dart/ast/ast.dart';
77
import 'package:analyzer/dart/ast/visitor.dart';
8-
import 'package:analyzer/dart/element/element2.dart';
98

109
import '../analyzer.dart';
10+
import '../extensions.dart';
1111
import '../utils.dart';
1212

1313
const _desc =
@@ -26,7 +26,7 @@ class LibraryPrefixes extends LintRule {
2626
@override
2727
void registerNodeProcessors(
2828
NodeLintRegistry registry, LinterContext context) {
29-
var visitor = _Visitor(this, context.libraryElement2);
29+
var visitor = _Visitor(this, context);
3030
registry.addImportDirective(this, visitor);
3131
}
3232
}
@@ -37,9 +37,9 @@ class _Visitor extends SimpleAstVisitor<void> {
3737

3838
final LintRule rule;
3939

40-
_Visitor(this.rule, LibraryElement2? library)
40+
_Visitor(this.rule, LinterContext context)
4141
: _wildCardVariablesEnabled =
42-
library?.featureSet.isEnabled(Feature.wildcard_variables) ?? false;
42+
context.isEnabled(Feature.wildcard_variables);
4343

4444
@override
4545
void visitImportDirective(ImportDirective node) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import 'package:analyzer/dart/analysis/features.dart';
66
import 'package:analyzer/dart/ast/ast.dart';
77
import 'package:analyzer/dart/ast/visitor.dart';
8-
import 'package:analyzer/dart/element/element2.dart';
98

109
import '../analyzer.dart';
10+
import '../extensions.dart';
1111
import '../util/ascii_utils.dart';
1212

1313
const _desc = r'Avoid leading underscores for library prefixes.';
@@ -26,7 +26,7 @@ class NoLeadingUnderscoresForLibraryPrefixes extends LintRule {
2626
@override
2727
void registerNodeProcessors(
2828
NodeLintRegistry registry, LinterContext context) {
29-
var visitor = _Visitor(this, context.libraryElement2);
29+
var visitor = _Visitor(this, context);
3030
registry.addImportDirective(this, visitor);
3131
}
3232
}
@@ -37,9 +37,9 @@ class _Visitor extends SimpleAstVisitor<void> {
3737

3838
final LintRule rule;
3939

40-
_Visitor(this.rule, LibraryElement2? library)
40+
_Visitor(this.rule, LinterContext context)
4141
: _wildCardVariablesEnabled =
42-
library?.featureSet.isEnabled(Feature.wildcard_variables) ?? false;
42+
context.isEnabled(Feature.wildcard_variables);
4343

4444
void checkIdentifier(SimpleIdentifier? id) {
4545
if (id == null) return;

0 commit comments

Comments
 (0)