refactor: prepare for complex metric values (#698)

* fix: corrected some typos

* chore: update cSpell dictionary

* chore: a bit refactor

* chore: update changelog

Author: dkrutskikh

.vscode/settings.json

@@ -27,6 +27,7 @@
         "setstate",
         "SLOC",
         "todos",
-        "unawaited"
+        "unawaited",
+        "writeln"
     ]
 }

CHANGELOG.md

@@ -3,10 +3,11 @@
 ## Unreleased
 
 * feat: add static code diagnostics `avoid-border-all`.
-* chore: activate new lint rules.
 * feat: improve `avoid-returning-widgets` builder functions handling.
 * fix: correctly handle const maps in `no-magic-number`.
 * fix: correctly handle excluded files for `check-unused-code`.
+* chore: activate new lint rules.
+* refactor: prepare for complex metric values.
 
 ## 4.11.0-dev.1
 

lib/src/analyzers/lint_analyzer/lint_analyzer.dart

@@ -296,7 +296,7 @@ class LintAnalyzer {
     final classRecords = <ScopedClassDeclaration, Report>{};
 
     for (final classDeclaration in visitor.classes) {
-      final metrics = <MetricValue<num>>[];
+      final metrics = <MetricValue>[];
 
       for (final metric in config.classesMetrics) {
         if (metric.supports(
@@ -336,7 +336,7 @@ class LintAnalyzer {
     InternalResolvedUnitResult source,
     LintAnalysisConfig config,
   ) {
-    final metrics = <MetricValue<num>>[];
+    final metrics = <MetricValue>[];
 
     for (final metric in config.fileMetrics) {
       if (metric.supports(
@@ -371,7 +371,7 @@ class LintAnalyzer {
     final functionRecords = <ScopedFunctionDeclaration, Report>{};
 
     for (final function in visitor.functions) {
-      final metrics = <MetricValue<num>>[];
+      final metrics = <MetricValue>[];
 
       for (final metric in config.methodsMetrics) {
         if (metric.supports(

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

@@ -20,7 +20,7 @@ const _documentation = MetricDocumentation(
   name: 'Cyclomatic Complexity',
   shortName: 'CYCLO',
   measuredType: EntityType.methodEntity,
-  recomendedThreshold: 20,
+  recommendedThreshold: 20,
 );
 
 /// Cyclomatic Complexity (CYCLO)
@@ -45,7 +45,7 @@ class CyclomaticComplexityMetric extends FunctionMetric<int> {
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
-    Iterable<MetricValue<num>> otherMetricsValues,
+    Iterable<MetricValue> otherMetricsValues,
   ) {
     final visitor = CyclomaticComplexityFlowVisitor();
     node.visitChildren(visitor);

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

@@ -17,7 +17,7 @@ const _documentation = MetricDocumentation(
   name: 'Halstead Volume',
   shortName: 'HALVOL',
   measuredType: EntityType.methodEntity,
-  recomendedThreshold: 150,
+  recommendedThreshold: 150,
 );
 
 /// Halstead Volume (HALVOL)
@@ -45,7 +45,7 @@ class HalsteadVolumeMetric extends FunctionMetric<double> {
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
-    Iterable<MetricValue<num>> otherMetricsValues,
+    Iterable<MetricValue> otherMetricsValues,
   ) {
     final visitor = HalsteadVolumeAstVisitor();
     node.visitChildren(visitor);

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

@@ -14,7 +14,7 @@ const _documentation = MetricDocumentation(
   name: 'Lines of Code',
   shortName: 'LOC',
   measuredType: EntityType.methodEntity,
-  recomendedThreshold: 100,
+  recommendedThreshold: 100,
 );
 
 /// Lines of Code (LOC)
@@ -39,7 +39,7 @@ class LinesOfCodeMetric extends FunctionMetric<int> {
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
-    Iterable<MetricValue<num>> otherMetricsValues,
+    Iterable<MetricValue> otherMetricsValues,
   ) =>
       MetricComputationResult(
         value: 1 +

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

@@ -19,7 +19,7 @@ const _documentation = MetricDocumentation(
   name: 'Maintainability Index',
   shortName: 'MI',
   measuredType: EntityType.methodEntity,
-  recomendedThreshold: 50,
+  recommendedThreshold: 50,
 );
 
 /// Maintainability Index (MI)
@@ -43,7 +43,7 @@ class MaintainabilityIndexMetric extends FunctionMetric<int> {
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
-    Iterable<MetricValue<Object>> otherMetricsValues,
+    Iterable<MetricValue> otherMetricsValues,
   ) =>
       super.supports(
         node,
@@ -65,7 +65,7 @@ class MaintainabilityIndexMetric extends FunctionMetric<int> {
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
-    Iterable<MetricValue<num>> otherMetricsValues,
+    Iterable<MetricValue> otherMetricsValues,
   ) {
     final halVol = otherMetricsValues.firstWhere(
       (value) => value.metricsId == HalsteadVolumeMetric.metricId,

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

@@ -18,7 +18,7 @@ const _documentation = MetricDocumentation(
   name: 'Maximum Nesting Level',
   shortName: 'MAXNESTING',
   measuredType: EntityType.methodEntity,
-  recomendedThreshold: 5,
+  recommendedThreshold: 5,
 );
 
 /// Maximum Nesting Level (MAXNESTING)
@@ -44,7 +44,7 @@ class MaximumNestingLevelMetric extends FunctionMetric<int> {
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
-    Iterable<MetricValue<num>> otherMetricsValues,
+    Iterable<MetricValue> otherMetricsValues,
   ) {
     final visitor = NestingLevelVisitor(node);
     node.visitChildren(visitor);

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

@@ -17,7 +17,7 @@ const _documentation = MetricDocumentation(
   name: 'Number of Methods',
   shortName: 'NOM',
   measuredType: EntityType.classEntity,
-  recomendedThreshold: 10,
+  recommendedThreshold: 10,
 );
 
 /// Number of Methods (NOM)
@@ -41,7 +41,7 @@ class NumberOfMethodsMetric extends ClassMetric<int> {
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
-    Iterable<MetricValue<num>> otherMetricsValues,
+    Iterable<MetricValue> otherMetricsValues,
   ) {
     final methods = classMethods(node, functionDeclarations);
 

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

@@ -15,7 +15,7 @@ const _documentation = MetricDocumentation(
   name: 'Number of Parameters',
   shortName: 'NOP',
   measuredType: EntityType.methodEntity,
-  recomendedThreshold: 4,
+  recommendedThreshold: 4,
 );
 
 /// Number of Parameters (NOP)
@@ -39,7 +39,7 @@ class NumberOfParametersMetric extends FunctionMetric<int> {
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
-    Iterable<MetricValue<Object>> otherMetricsValues,
+    Iterable<MetricValue> otherMetricsValues,
   ) {
     if (node is FunctionDeclaration) {
       return true;
@@ -64,7 +64,7 @@ class NumberOfParametersMetric extends FunctionMetric<int> {
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
-    Iterable<MetricValue<num>> otherMetricsValues,
+    Iterable<MetricValue> otherMetricsValues,
   ) {
     int? parametersCount;