|
1 | 1 | import 'package:analyzer/dart/ast/ast.dart';
|
2 | 2 | import 'package:analyzer/error/listener.dart';
|
3 | 3 | import 'package:custom_lint_builder/custom_lint_builder.dart';
|
4 |
| -import 'package:solid_lints/src/lints/use_descriptive_names_for_type_parameters/visitors/use_descriptive_names_for_type_parameters_visitor.dart'; |
5 | 4 | import 'package:solid_lints/src/models/rule_config.dart';
|
6 | 5 | import 'package:solid_lints/src/models/solid_lint_rule.dart';
|
7 | 6 |
|
@@ -37,48 +36,43 @@ class UseDescriptiveNamesForTypeParametersRule extends SolidLintRule {
|
37 | 36 | CustomLintContext context,
|
38 | 37 | ) {
|
39 | 38 | context.registry.addClassDeclaration((node) {
|
40 |
| - final visitor = UseDescriptiveNamesForTypeParametersVisitor(); |
41 |
| - visitor.visitClassDeclaration(node); |
42 |
| - _reportViolations(reporter, visitor.singleLetterTypeParameters); |
| 39 | + _checkAndReport(node.typeParameters, reporter); |
43 | 40 | });
|
44 | 41 |
|
45 | 42 | context.registry.addFunctionDeclaration((node) {
|
46 |
| - final visitor = UseDescriptiveNamesForTypeParametersVisitor(); |
47 |
| - visitor.visitFunctionDeclaration(node); |
48 |
| - _reportViolations(reporter, visitor.singleLetterTypeParameters); |
| 43 | + _checkAndReport(node.functionExpression.typeParameters, reporter); |
49 | 44 | });
|
50 | 45 |
|
51 | 46 | context.registry.addMethodDeclaration((node) {
|
52 |
| - final visitor = UseDescriptiveNamesForTypeParametersVisitor(); |
53 |
| - visitor.visitMethodDeclaration(node); |
54 |
| - _reportViolations(reporter, visitor.singleLetterTypeParameters); |
| 47 | + _checkAndReport(node.typeParameters, reporter); |
55 | 48 | });
|
56 | 49 |
|
57 | 50 | context.registry.addGenericTypeAlias((node) {
|
58 |
| - final visitor = UseDescriptiveNamesForTypeParametersVisitor(); |
59 |
| - visitor.visitGenericTypeAlias(node); |
60 |
| - _reportViolations(reporter, visitor.singleLetterTypeParameters); |
| 51 | + _checkAndReport(node.typeParameters, reporter); |
61 | 52 | });
|
62 | 53 |
|
63 | 54 | context.registry.addExtensionDeclaration((node) {
|
64 |
| - final visitor = UseDescriptiveNamesForTypeParametersVisitor(); |
65 |
| - visitor.visitExtensionDeclaration(node); |
66 |
| - _reportViolations(reporter, visitor.singleLetterTypeParameters); |
| 55 | + _checkAndReport(node.typeParameters, reporter); |
67 | 56 | });
|
68 | 57 |
|
69 | 58 | context.registry.addMixinDeclaration((node) {
|
70 |
| - final visitor = UseDescriptiveNamesForTypeParametersVisitor(); |
71 |
| - visitor.visitMixinDeclaration(node); |
72 |
| - _reportViolations(reporter, visitor.singleLetterTypeParameters); |
| 59 | + _checkAndReport(node.typeParameters, reporter); |
73 | 60 | });
|
74 | 61 | }
|
75 | 62 |
|
76 |
| - void _reportViolations( |
| 63 | + void _checkAndReport( |
| 64 | + TypeParameterList? typeParameters, |
77 | 65 | ErrorReporter reporter,
|
78 |
| - List<TypeParameter> singleLetterTypeParameters, |
79 | 66 | ) {
|
80 |
| - for (final param in singleLetterTypeParameters) { |
81 |
| - reporter.atNode(param, code); |
| 67 | + if (typeParameters == null || typeParameters.typeParameters.length < 3) { |
| 68 | + return; |
| 69 | + } |
| 70 | + |
| 71 | + for (final param in typeParameters.typeParameters) { |
| 72 | + final name = param.name.lexeme; |
| 73 | + if (name.length == 1) { |
| 74 | + reporter.atNode(param, code); |
| 75 | + } |
82 | 76 | }
|
83 | 77 | }
|
84 | 78 | }
|
0 commit comments