Skip to content
This repository was archived by the owner on Jul 16, 2023. It is now read-only.

Commit 731921f

Browse files
committed
* chore: migrate from firstWhereOrNull on any
* chore: migrate on `TokenType.AT`
1 parent 41d960c commit 731921f

File tree

9 files changed

+16
-12
lines changed

9 files changed

+16
-12
lines changed

lib/src/analyzers/lint_analyzer/rules/rules_list/avoid_preserve_whitespace_false/visitor.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class _Visitor extends RecursiveAstVisitor<void> {
88
@override
99
void visitAnnotation(Annotation node) {
1010
if (node.name.name == 'Component' &&
11-
node.atSign.type.lexeme == '@' &&
11+
node.atSign.type == TokenType.AT &&
1212
node.parent is ClassDeclaration) {
1313
final preserveWhitespaceArg = node.arguments?.arguments
1414
.whereType<NamedExpression>()

lib/src/analyzers/lint_analyzer/rules/rules_list/avoid_returning_widgets/avoid_returning_widgets.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:analyzer/dart/ast/ast.dart';
2+
import 'package:analyzer/dart/ast/token.dart';
23
import 'package:analyzer/dart/ast/visitor.dart';
34
import 'package:analyzer/dart/element/type.dart';
45
import 'package:collection/collection.dart';

lib/src/analyzers/lint_analyzer/rules/rules_list/avoid_returning_widgets/visitor.dart

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,11 @@ class _Visitor extends RecursiveAstVisitor<void> {
4040
TypeAnnotation? returnType, {
4141
required bool isSetter,
4242
}) {
43-
final hasIgnoredAnnotation = node.metadata.firstWhereOrNull(
44-
(node) =>
45-
_ignoredAnnotations.contains(node.name.name) &&
46-
node.atSign.type.lexeme == '@',
47-
) !=
48-
null;
43+
final hasIgnoredAnnotation = node.metadata.any(
44+
(node) =>
45+
_ignoredAnnotations.contains(node.name.name) &&
46+
node.atSign.type == TokenType.AT,
47+
);
4948

5049
if (!hasIgnoredAnnotation && !isSetter && !_isIgnored(name.name)) {
5150
final type = returnType?.type;
@@ -84,8 +83,7 @@ class _Visitor extends RecursiveAstVisitor<void> {
8483
type?.getDisplayString(withNullability: false) == 'Widget';
8584

8685
bool _isSubclassOfWidget(DartType? type) =>
87-
type is InterfaceType &&
88-
type.allSupertypes.firstWhereOrNull(_isWidget) != null;
86+
type is InterfaceType && type.allSupertypes.any(_isWidget);
8987

9088
bool _isIgnored(String name) =>
9189
name == 'build' || _ignoredNames.contains(name);

lib/src/analyzers/lint_analyzer/rules/rules_list/avoid_unused_parameters/avoid_unused_parameters.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'package:analyzer/dart/ast/ast.dart';
22
import 'package:analyzer/dart/ast/syntactic_entity.dart';
3+
import 'package:analyzer/dart/ast/token.dart';
34
import 'package:analyzer/dart/ast/visitor.dart';
45
import 'package:collection/collection.dart';
56

lib/src/analyzers/lint_analyzer/rules/rules_list/avoid_unused_parameters/visitor.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ class _Visitor extends RecursiveAstVisitor<void> {
2222
}
2323

2424
final isOverride = node.metadata.any(
25-
(node) => node.name.name == 'override' && node.atSign.type.lexeme == '@',
25+
(node) =>
26+
node.name.name == 'override' && node.atSign.type == TokenType.AT,
2627
);
2728

2829
if (isOverride) {

lib/src/analyzers/lint_analyzer/rules/rules_list/component_annotation_arguments_ordering/component_annotation_arguments_ordering.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:analyzer/dart/ast/ast.dart';
2+
import 'package:analyzer/dart/ast/token.dart';
23
import 'package:analyzer/dart/ast/visitor.dart';
34
import 'package:collection/collection.dart';
45
import 'package:meta/meta.dart';

lib/src/analyzers/lint_analyzer/rules/rules_list/component_annotation_arguments_ordering/visitor.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ class _Visitor extends SimpleAstVisitor<List<_ArgumentInfo>> {
6969
_groupsOrder.indexOf(argumentGroup);
7070

7171
bool _isComponentAnnotation(Annotation node) =>
72-
node.name.name == 'Component' && node.atSign.type.lexeme == '@';
72+
node.name.name == 'Component' &&
73+
node.atSign.type == TokenType.TokenType.AT;
7374
}
7475

7576
@immutable

lib/src/analyzers/lint_analyzer/rules/rules_list/prefer_on_push_cd_strategy/prefer_on_push_cd_strategy.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:analyzer/dart/ast/ast.dart';
2+
import 'package:analyzer/dart/ast/token.dart';
23
import 'package:analyzer/dart/ast/visitor.dart';
34
import 'package:collection/collection.dart';
45

lib/src/analyzers/lint_analyzer/rules/rules_list/prefer_on_push_cd_strategy/visitor.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ class _Visitor extends RecursiveAstVisitor<void> {
3333

3434
bool _isComponentAnnotation(Annotation node) =>
3535
node.name.name == 'Component' &&
36-
node.atSign.type.lexeme == '@' &&
36+
node.atSign.type == TokenType.AT &&
3737
node.parent is ClassDeclaration;
3838
}

0 commit comments

Comments
 (0)