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

Commit a7b57bb

Browse files
dkrutskikhdkrutskikh
committed
chore: a bit refactor
1 parent 29ff7fc commit a7b57bb

26 files changed

+38
-38
lines changed

‎lib/src/analyzers/lint_analyzer/lint_analyzer.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ class LintAnalyzer {
296296
final classRecords = <ScopedClassDeclaration, Report>{};
297297

298298
for (final classDeclaration in visitor.classes) {
299-
final metrics = <MetricValue<num>>[];
299+
final metrics = <MetricValue>[];
300300

301301
for (final metric in config.classesMetrics) {
302302
if (metric.supports(
@@ -336,7 +336,7 @@ class LintAnalyzer {
336336
InternalResolvedUnitResult source,
337337
LintAnalysisConfig config,
338338
) {
339-
final metrics = <MetricValue<num>>[];
339+
final metrics = <MetricValue>[];
340340

341341
for (final metric in config.fileMetrics) {
342342
if (metric.supports(
@@ -371,7 +371,7 @@ class LintAnalyzer {
371371
final functionRecords = <ScopedFunctionDeclaration, Report>{};
372372

373373
for (final function in visitor.functions) {
374-
final metrics = <MetricValue<num>>[];
374+
final metrics = <MetricValue>[];
375375

376376
for (final metric in config.methodsMetrics) {
377377
if (metric.supports(

‎lib/src/analyzers/lint_analyzer/metrics/metrics_list/cyclomatic_complexity/cyclomatic_complexity_metric.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class CyclomaticComplexityMetric extends FunctionMetric<int> {
4545
Iterable<ScopedClassDeclaration> classDeclarations,
4646
Iterable<ScopedFunctionDeclaration> functionDeclarations,
4747
InternalResolvedUnitResult source,
48-
Iterable<MetricValue<num>> otherMetricsValues,
48+
Iterable<MetricValue> otherMetricsValues,
4949
) {
5050
final visitor = CyclomaticComplexityFlowVisitor();
5151
node.visitChildren(visitor);

‎lib/src/analyzers/lint_analyzer/metrics/metrics_list/halstead_volume/halstead_volume_metric.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class HalsteadVolumeMetric extends FunctionMetric<double> {
4545
Iterable<ScopedClassDeclaration> classDeclarations,
4646
Iterable<ScopedFunctionDeclaration> functionDeclarations,
4747
InternalResolvedUnitResult source,
48-
Iterable<MetricValue<num>> otherMetricsValues,
48+
Iterable<MetricValue> otherMetricsValues,
4949
) {
5050
final visitor = HalsteadVolumeAstVisitor();
5151
node.visitChildren(visitor);

‎lib/src/analyzers/lint_analyzer/metrics/metrics_list/lines_of_code_metric.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class LinesOfCodeMetric extends FunctionMetric<int> {
3939
Iterable<ScopedClassDeclaration> classDeclarations,
4040
Iterable<ScopedFunctionDeclaration> functionDeclarations,
4141
InternalResolvedUnitResult source,
42-
Iterable<MetricValue<num>> otherMetricsValues,
42+
Iterable<MetricValue> otherMetricsValues,
4343
) =>
4444
MetricComputationResult(
4545
value: 1 +

‎lib/src/analyzers/lint_analyzer/metrics/metrics_list/maintainability_index_metric.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class MaintainabilityIndexMetric extends FunctionMetric<int> {
4343
Iterable<ScopedClassDeclaration> classDeclarations,
4444
Iterable<ScopedFunctionDeclaration> functionDeclarations,
4545
InternalResolvedUnitResult source,
46-
Iterable<MetricValue<Object>> otherMetricsValues,
46+
Iterable<MetricValue> otherMetricsValues,
4747
) =>
4848
super.supports(
4949
node,
@@ -65,7 +65,7 @@ class MaintainabilityIndexMetric extends FunctionMetric<int> {
6565
Iterable<ScopedClassDeclaration> classDeclarations,
6666
Iterable<ScopedFunctionDeclaration> functionDeclarations,
6767
InternalResolvedUnitResult source,
68-
Iterable<MetricValue<num>> otherMetricsValues,
68+
Iterable<MetricValue> otherMetricsValues,
6969
) {
7070
final halVol = otherMetricsValues.firstWhere(
7171
(value) => value.metricsId == HalsteadVolumeMetric.metricId,

‎lib/src/analyzers/lint_analyzer/metrics/metrics_list/maximum_nesting_level/maximum_nesting_level_metric.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class MaximumNestingLevelMetric extends FunctionMetric<int> {
4444
Iterable<ScopedClassDeclaration> classDeclarations,
4545
Iterable<ScopedFunctionDeclaration> functionDeclarations,
4646
InternalResolvedUnitResult source,
47-
Iterable<MetricValue<num>> otherMetricsValues,
47+
Iterable<MetricValue> otherMetricsValues,
4848
) {
4949
final visitor = NestingLevelVisitor(node);
5050
node.visitChildren(visitor);

‎lib/src/analyzers/lint_analyzer/metrics/metrics_list/number_of_methods_metric.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class NumberOfMethodsMetric extends ClassMetric<int> {
4141
Iterable<ScopedClassDeclaration> classDeclarations,
4242
Iterable<ScopedFunctionDeclaration> functionDeclarations,
4343
InternalResolvedUnitResult source,
44-
Iterable<MetricValue<num>> otherMetricsValues,
44+
Iterable<MetricValue> otherMetricsValues,
4545
) {
4646
final methods = classMethods(node, functionDeclarations);
4747

‎lib/src/analyzers/lint_analyzer/metrics/metrics_list/number_of_parameters_metric.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class NumberOfParametersMetric extends FunctionMetric<int> {
3939
Iterable<ScopedClassDeclaration> classDeclarations,
4040
Iterable<ScopedFunctionDeclaration> functionDeclarations,
4141
InternalResolvedUnitResult source,
42-
Iterable<MetricValue<Object>> otherMetricsValues,
42+
Iterable<MetricValue> otherMetricsValues,
4343
) {
4444
if (node is FunctionDeclaration) {
4545
return true;
@@ -64,7 +64,7 @@ class NumberOfParametersMetric extends FunctionMetric<int> {
6464
Iterable<ScopedClassDeclaration> classDeclarations,
6565
Iterable<ScopedFunctionDeclaration> functionDeclarations,
6666
InternalResolvedUnitResult source,
67-
Iterable<MetricValue<num>> otherMetricsValues,
67+
Iterable<MetricValue> otherMetricsValues,
6868
) {
6969
int? parametersCount;
7070

‎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
@@ -44,7 +44,7 @@ class SourceLinesOfCodeMetric extends FunctionMetric<int> {
4444
Iterable<ScopedClassDeclaration> classDeclarations,
4545
Iterable<ScopedFunctionDeclaration> functionDeclarations,
4646
InternalResolvedUnitResult source,
47-
Iterable<MetricValue<num>> otherMetricsValues,
47+
Iterable<MetricValue> otherMetricsValues,
4848
) {
4949
final visitor = SourceCodeVisitor(source.lineInfo);
5050
node.visitChildren(visitor);

‎lib/src/analyzers/lint_analyzer/metrics/metrics_list/technical_debt/technical_debt_metric.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class TechnicalDebtMetric extends FileMetric<double> {
7777
Iterable<ScopedClassDeclaration> classDeclarations,
7878
Iterable<ScopedFunctionDeclaration> functionDeclarations,
7979
InternalResolvedUnitResult source,
80-
Iterable<MetricValue<num>> otherMetricsValues,
80+
Iterable<MetricValue> otherMetricsValues,
8181
) {
8282
var debt = 0.0;
8383

‎lib/src/analyzers/lint_analyzer/metrics/metrics_list/weight_of_class_metric.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class WeightOfClassMetric extends ClassMetric<double> {
4242
Iterable<ScopedClassDeclaration> classDeclarations,
4343
Iterable<ScopedFunctionDeclaration> functionDeclarations,
4444
InternalResolvedUnitResult source,
45-
Iterable<MetricValue<Object>> otherMetricsValues,
45+
Iterable<MetricValue> otherMetricsValues,
4646
) =>
4747
super.supports(
4848
node,
@@ -61,7 +61,7 @@ class WeightOfClassMetric extends ClassMetric<double> {
6161
Iterable<ScopedClassDeclaration> classDeclarations,
6262
Iterable<ScopedFunctionDeclaration> functionDeclarations,
6363
InternalResolvedUnitResult source,
64-
Iterable<MetricValue<num>> otherMetricsValues,
64+
Iterable<MetricValue> otherMetricsValues,
6565
) {
6666
final totalPublicMethods = classMethods(node, functionDeclarations)
6767
.where(_isPublicMethod)

‎lib/src/analyzers/lint_analyzer/metrics/models/file_metric.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ abstract class FileMetric<T extends num> extends Metric<T> {
2929
Iterable<ScopedClassDeclaration> classDeclarations,
3030
Iterable<ScopedFunctionDeclaration> functionDeclarations,
3131
InternalResolvedUnitResult source,
32-
Iterable<MetricValue<Object>> otherMetricsValues,
32+
Iterable<MetricValue> otherMetricsValues,
3333
) =>
3434
node is CompilationUnit;
3535

‎lib/src/analyzers/lint_analyzer/metrics/models/metric.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ abstract class Metric<T extends num> {
3939
Iterable<ScopedClassDeclaration> classDeclarations,
4040
Iterable<ScopedFunctionDeclaration> functionDeclarations,
4141
InternalResolvedUnitResult source,
42-
Iterable<MetricValue<Object>> otherMetricsValues,
42+
Iterable<MetricValue> otherMetricsValues,
4343
) =>
4444
true;
4545

@@ -49,7 +49,7 @@ abstract class Metric<T extends num> {
4949
Iterable<ScopedClassDeclaration> classDeclarations,
5050
Iterable<ScopedFunctionDeclaration> functionDeclarations,
5151
InternalResolvedUnitResult source,
52-
Iterable<MetricValue<num>> otherMetricsValues,
52+
Iterable<MetricValue> otherMetricsValues,
5353
) {
5454
final result = computeImplementation(
5555
node,
@@ -80,7 +80,7 @@ abstract class Metric<T extends num> {
8080
Iterable<ScopedClassDeclaration> classDeclarations,
8181
Iterable<ScopedFunctionDeclaration> functionDeclarations,
8282
InternalResolvedUnitResult source,
83-
Iterable<MetricValue<num>> otherMetricsValues,
83+
Iterable<MetricValue> otherMetricsValues,
8484
);
8585

8686
/// Returns the message for the user containing information about the computed value.

‎lib/src/analyzers/lint_analyzer/metrics/models/metric_value.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'metric_documentation.dart';
33
import 'metric_value_level.dart';
44

55
/// Represents a value computed by the metric.
6-
class MetricValue<T> {
6+
class MetricValue<T extends num> {
77
/// The id of the computed metric.
88
final String metricsId;
99

‎lib/src/analyzers/lint_analyzer/models/report.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ class Report {
1414
final AstNode declaration;
1515

1616
/// Target entity metrics.
17-
final Iterable<MetricValue<num>> metrics;
17+
final Iterable<MetricValue> metrics;
1818

1919
/// Returns a certain target metric.
20-
MetricValue<num>? metric(String id) =>
20+
MetricValue? metric(String id) =>
2121
metrics.firstWhereOrNull((metric) => metric.metricsId == id);
2222

2323
/// The highest reported level of a metric.

‎lib/src/analyzers/lint_analyzer/models/summary_lint_report_record.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'summary_lint_report_record_status.dart';
22

33
/// Represents a summary for a lint report.
4-
class SummaryLintReportRecord<T> {
4+
class SummaryLintReportRecord<T extends Object> {
55
final SummaryLintReportRecordStatus status;
66

77
final String title;

‎lib/src/analyzers/lint_analyzer/reporters/reporters_list/console/lint_console_reporter.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,6 @@ class LintConsoleReporter extends ConsoleReporter<LintFileReport,
8585
return [];
8686
}
8787

88-
bool _isNeedToReport(MetricValue<Object> metric) =>
88+
bool _isNeedToReport(MetricValue metric) =>
8989
metric.level > MetricValueLevel.none;
9090
}

‎lib/src/analyzers/lint_analyzer/reporters/reporters_list/console/lint_console_reporter_helper.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class LintConsoleReporterHelper {
7575
}
7676

7777
/// Converts a [metric] to the metric message string.
78-
String getMetricReport(MetricValue<num> metric) {
78+
String getMetricReport(MetricValue metric) {
7979
final color = _colorPens[metric.level];
8080

8181
if (color != null) {

‎lib/src/analyzers/lint_analyzer/reporters/reporters_list/html/components/report_details_tooltip.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Element renderDetailsTooltip(Report entityReport, String entityType) {
2323
return tooltip;
2424
}
2525

26-
Element renderDetailsTooltipMetric(MetricValue<num> metric) {
26+
Element renderDetailsTooltipMetric(MetricValue metric) {
2727
final metricName = metric.documentation.name.toLowerCase();
2828
final violationLevel = metric.level.toString();
2929

‎lib/src/analyzers/lint_analyzer/reporters/reporters_list/json/lint_json_reporter.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class LintJsonReporter extends JsonReporter<LintFileReport,
9393
};
9494

9595
List<Map<String, Object>> _metricValuesToJson(
96-
Iterable<MetricValue<num>> metrics,
96+
Iterable<MetricValue> metrics,
9797
) =>
9898
metrics.map((metric) {
9999
final unitType = metric.unitType;

‎lib/src/analyzers/lint_analyzer/reporters/utility_selector.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class UtilitySelector {
124124
);
125125
}
126126

127-
MetricValue<T> _buildMetricValueStub<T>({
127+
MetricValue<T> _buildMetricValueStub<T extends num>({
128128
required String id,
129129
required T value,
130130
EntityType type = EntityType.methodEntity,

‎lib/src/config_builder/config_builder.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ class ConfigBuilder {
2929
static LintAnalysisConfig getLintAnalysisConfig(
3030
LintConfig config,
3131
String excludesRootFolder, {
32-
Iterable<Metric<num>>? classMetrics,
33-
Iterable<Metric<num>>? fileMetrics,
34-
Iterable<Metric<num>>? functionMetrics,
32+
Iterable<Metric>? classMetrics,
33+
Iterable<Metric>? fileMetrics,
34+
Iterable<Metric>? functionMetrics,
3535
}) {
3636
final patterns = getPatternsById(config);
3737
final patternsDependencies = patterns

‎test/resources/maintability_index_metric_example.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class MaintainabilityIndexMetric extends FunctionMetric<int> {
1818
Iterable<ScopedClassDeclaration> classDeclarations,
1919
Iterable<ScopedFunctionDeclaration> functionDeclarations,
2020
InternalResolvedUnitResult source,
21-
Iterable<MetricValue<num>> otherMetricsValues,
21+
Iterable<MetricValue> otherMetricsValues,
2222
) {
2323
final halVol = otherMetricsValues.firstWhere(
2424
(value) => value.metricsId == HalsteadVolumeMetric.metricId,

‎test/resources/number_of_parameters_metric_example.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class NumberOfParametersMetric extends FunctionMetric<int> {
3333
Iterable<ScopedClassDeclaration> classDeclarations,
3434
Iterable<ScopedFunctionDeclaration> functionDeclarations,
3535
InternalResolvedUnitResult source,
36-
Iterable<MetricValue<num>> otherMetricsValues,
36+
Iterable<MetricValue> otherMetricsValues,
3737
) {
3838
int? parametersCount;
3939
if (node is FunctionDeclaration) {

‎test/stubs_builders.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import 'package:source_span/source_span.dart';
1515

1616
class _DeclarationMock extends Mock implements Declaration {}
1717

18-
MetricValue<T> buildMetricValueStub<T>({
18+
MetricValue<T> buildMetricValueStub<T extends num>({
1919
required String id,
2020
required T value,
2121
String? unitType,
@@ -38,7 +38,7 @@ MetricValue<T> buildMetricValueStub<T>({
3838

3939
Report buildReportStub({
4040
SourceSpanBase? location,
41-
Iterable<MetricValue<num>> metrics = const [],
41+
Iterable<MetricValue> metrics = const [],
4242
}) {
4343
const defaultMetricValues = [
4444
MetricValue<int>(
@@ -77,7 +77,7 @@ Report buildReportStub({
7777

7878
Report buildFunctionRecordStub({
7979
SourceSpanBase? location,
80-
Iterable<MetricValue<num>> metrics = const [],
80+
Iterable<MetricValue> metrics = const [],
8181
}) {
8282
final defaultMetricValues = [
8383
buildMetricValueStub<int>(

‎website/docs/metrics/maintainability-index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ MetricComputationResult<int> computeImplementation(
3333
Iterable<ScopedClassDeclaration> classDeclarations,
3434
Iterable<ScopedFunctionDeclaration> functionDeclarations,
3535
InternalResolvedUnitResult source,
36-
Iterable<MetricValue<num>> otherMetricsValues,
36+
Iterable<MetricValue> otherMetricsValues,
3737
) {
3838
final halVol = otherMetricsValues.firstWhere(
3939
(value) => value.metricsId == HalsteadVolumeMetric.metricId,

0 commit comments

Comments
 (0)