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

Commit 46c95b2

Browse files
committed
chore: review cleanup
1 parent 841eaa0 commit 46c95b2

File tree

7 files changed

+21
-11
lines changed

7 files changed

+21
-11
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
* fix: improve context root included files calculation.
99
* feat: add [`avoid-banned-imports`](https://dartcodemetrics.dev/docs/rules/common/avoid-banned-imports) rule
1010
* fix: resolve package with imported analysis options.
11+
* feat: add configuration to [`prefer-extracting-callbacks`](https://dartcodemetrics.dev/docs/rules/flutter/prefer-extracting-callbacks)
1112

1213
## 4.15.2
1314

dart_dependency_validator.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ ignore:
22
- analyzer
33
- intl
44
- test_lints
5+
- flutter

lib/src/analyzers/lint_analyzer/metrics/metrics_list/source_lines_of_code/source_lines_of_code_metric.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import 'package:analyzer/dart/ast/ast.dart';
22
import 'package:source_span/source_span.dart';
33

4+
import '../../../base_visitors/source_code_visitor.dart';
45
import '../../../models/context_message.dart';
56
import '../../../models/entity_type.dart';
67
import '../../../models/internal_resolved_unit_result.dart';
@@ -11,7 +12,6 @@ import '../../models/function_metric.dart';
1112
import '../../models/metric_computation_result.dart';
1213
import '../../models/metric_documentation.dart';
1314
import '../../models/metric_value.dart';
14-
import 'source_code_visitor.dart';
1515

1616
const _documentation = MetricDocumentation(
1717
name: 'Source lines of Code',

lib/src/analyzers/lint_analyzer/rules/rules_list/prefer_extracting_callbacks/prefer_extracting_callbacks_rule.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
import 'package:analyzer/dart/ast/ast.dart';
44
import 'package:analyzer/dart/ast/visitor.dart';
5+
import 'package:analyzer/source/line_info.dart';
56

67
import '../../../../../utils/flutter_types_utils.dart';
78
import '../../../../../utils/node_utils.dart';
9+
import '../../../base_visitors/source_code_visitor.dart';
810
import '../../../lint_utils.dart';
9-
import '../../../metrics/metrics_list/source_lines_of_code/source_code_visitor.dart';
1011
import '../../../models/internal_resolved_unit_result.dart';
1112
import '../../../models/issue.dart';
1213
import '../../../models/severity.dart';
@@ -36,7 +37,8 @@ class PreferExtractingCallbacksRule extends FlutterRule {
3637

3738
@override
3839
Iterable<Issue> check(InternalResolvedUnitResult source) {
39-
final visitor = _Visitor(source, _ignoredArguments, _allowedLineCount);
40+
final visitor =
41+
_Visitor(source.lineInfo, _ignoredArguments, _allowedLineCount);
4042

4143
source.unit.visitChildren(visitor);
4244

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ part of 'prefer_extracting_callbacks_rule.dart';
33
class _Visitor extends SimpleAstVisitor<void> {
44
final _expressions = <Expression>[];
55

6-
final InternalResolvedUnitResult _source;
6+
final LineInfo _lineInfo;
77
final Iterable<String> _ignoredArguments;
88
final int? _allowedLineCount;
99

1010
Iterable<Expression> get expressions => _expressions;
1111

12-
_Visitor(this._source, this._ignoredArguments, this._allowedLineCount);
12+
_Visitor(this._lineInfo, this._ignoredArguments, this._allowedLineCount);
1313

1414
@override
1515
void visitClassDeclaration(ClassDeclaration node) {
@@ -19,8 +19,11 @@ class _Visitor extends SimpleAstVisitor<void> {
1919
return;
2020
}
2121

22-
final visitor =
23-
_InstanceCreationVisitor(_source, _ignoredArguments, _allowedLineCount);
22+
final visitor = _InstanceCreationVisitor(
23+
_lineInfo,
24+
_ignoredArguments,
25+
_allowedLineCount,
26+
);
2427
node.visitChildren(visitor);
2528

2629
_expressions.addAll(visitor.expressions);
@@ -30,14 +33,17 @@ class _Visitor extends SimpleAstVisitor<void> {
3033
class _InstanceCreationVisitor extends RecursiveAstVisitor<void> {
3134
final _expressions = <Expression>[];
3235

33-
final InternalResolvedUnitResult _source;
36+
final LineInfo _lineInfo;
3437
final Iterable<String> _ignoredArguments;
3538
final int? _allowedLineCount;
3639

3740
Iterable<Expression> get expressions => _expressions;
3841

3942
_InstanceCreationVisitor(
40-
this._source, this._ignoredArguments, this._allowedLineCount);
43+
this._lineInfo,
44+
this._ignoredArguments,
45+
this._allowedLineCount,
46+
);
4147

4248
@override
4349
void visitInstanceCreationExpression(InstanceCreationExpression node) {
@@ -88,7 +94,7 @@ class _InstanceCreationVisitor extends RecursiveAstVisitor<void> {
8894
return true;
8995
}
9096

91-
final visitor = SourceCodeVisitor(_source.lineInfo);
97+
final visitor = SourceCodeVisitor(_lineInfo);
9298
expression.visitChildren(visitor);
9399

94100
return visitor.linesWithCode.length > allowedLineCount;

test/src/analyzers/lint_analyzer/metrics/metrics_list/source_lines_of_code/source_code_visitor_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/metrics/metrics_list/source_lines_of_code/source_code_visitor.dart';
1+
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/base_visitors/source_code_visitor.dart';
22
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/metrics/scope_visitor.dart';
33
import 'package:test/test.dart';
44

0 commit comments

Comments
 (0)