a bit refactor

dart-code-checker · Dec 5, 2020 · f847697 · f847697
1 parent 9286a71
commit f847697
Show file tree

Hide file tree

Showing 8 changed files with 161 additions and 188 deletions.
diff --git a/lib/src/analyzer_plugin/analyzer_plugin.dart b/lib/src/analyzer_plugin/analyzer_plugin.dart
@@ -11,7 +11,6 @@ import 'package:analyzer/src/context/context_root.dart';
 // ignore: implementation_imports
 import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:analyzer_plugin/plugin/plugin.dart';
-import 'package:analyzer_plugin/protocol/protocol_common.dart' as plugin;
 import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin;
 import 'package:source_span/source_span.dart';
 
@@ -373,7 +372,7 @@ class MetricsAnalyzerPlugin extends ServerPlugin {
     for (final file in filesToFullyResolve) {
       final contextRoot = contextRootContaining(file);
       if (contextRoot != null) {
-        // TODO(dmitrykrutskih): Which driver should we use if there is no context root?
+        // TODO(dkrutskikh): Which driver should we use if there is no context root?
         final driver = driverMap[contextRoot];
         filesByDriver.putIfAbsent(driver, () => <String>[]).add(file);
       }

diff --git a/lib/src/metrics_analyzer.dart b/lib/src/metrics_analyzer.dart
@@ -136,23 +136,23 @@ class MetricsAnalyzer {
             function.declaration.visitChildren(linesWithCodeAstVisitor);
 
             builder.recordFunction(
-                function,
-                FunctionRecord(
-                    firstLine: lineInfo
-                        .getLocation(function.declaration
-                            .firstTokenAfterCommentAndMetadata.offset)
-                        .lineNumber,
-                    lastLine: lineInfo
-                        .getLocation(function.declaration.endToken.end)
-                        .lineNumber,
-                    argumentsCount: getArgumentsCount(function),
-                    cyclomaticComplexityLines:
-                        Map.unmodifiable(controlFlowAstVisitor.complexityLines),
-                    linesWithCode: linesWithCodeAstVisitor.linesWithCode,
-                    operators:
-                        Map.unmodifiable(halsteadVolumeAstVisitor.operators),
-                    operands:
-                        Map.unmodifiable(halsteadVolumeAstVisitor.operands)));
+              function,
+              FunctionRecord(
+                firstLine: lineInfo
+                    .getLocation(function
+                        .declaration.firstTokenAfterCommentAndMetadata.offset)
+                    .lineNumber,
+                lastLine: lineInfo
+                    .getLocation(function.declaration.endToken.end)
+                    .lineNumber,
+                argumentsCount: getArgumentsCount(function),
+                cyclomaticComplexityLines:
+                    Map.unmodifiable(controlFlowAstVisitor.complexityLines),
+                linesWithCode: linesWithCodeAstVisitor.linesWithCode,
+                operators: Map.unmodifiable(halsteadVolumeAstVisitor.operators),
+                operands: Map.unmodifiable(halsteadVolumeAstVisitor.operands),
+              ),
+            );
           }
         }
 

diff --git a/lib/src/models/file_report.dart b/lib/src/models/file_report.dart
@@ -3,30 +3,30 @@ import 'package:meta/meta.dart';
 @immutable
 class FileReport {
   final int averageArgumentsCount;
-  final int totalArgumentsCountViolations;
+  final int argumentsCountViolations;
 
   final double averageMaintainabilityIndex;
-  final int totalMaintainabilityIndexViolations;
+  final int maintainabilityIndexViolations;
 
   final int averageMethodsCount;
-  final int totalMethodsCountViolations;
+  final int methodsCountViolations;
 
   final int totalCyclomaticComplexity;
-  final int totalCyclomaticComplexityViolations;
+  final int cyclomaticComplexityViolations;
 
   final int totalLinesOfExecutableCode;
-  final int totalLinesOfExecutableCodeViolations;
+  final int linesOfExecutableCodeViolations;
 
   const FileReport({
     @required this.averageArgumentsCount,
-    @required this.totalArgumentsCountViolations,
+    @required this.argumentsCountViolations,
     @required this.averageMaintainabilityIndex,
-    @required this.totalMaintainabilityIndexViolations,
+    @required this.maintainabilityIndexViolations,
     @required this.averageMethodsCount,
-    @required this.totalMethodsCountViolations,
+    @required this.methodsCountViolations,
     @required this.totalCyclomaticComplexity,
-    @required this.totalCyclomaticComplexityViolations,
+    @required this.cyclomaticComplexityViolations,
     @required this.totalLinesOfExecutableCode,
-    @required this.totalLinesOfExecutableCodeViolations,
+    @required this.linesOfExecutableCodeViolations,
   });
 }
diff --git a/lib/src/reporters/code_climate/code_climate_reporter.dart b/lib/src/reporters/code_climate/code_climate_reporter.dart
@@ -8,7 +8,7 @@ import '../reporter.dart';
 import '../utility_selector.dart';
 import 'code_climate_issue.dart';
 
-/// Creates reports in Codeclimate format widely understood by various CI and analysis tools
+/// Creates reports in Code Climate format widely understood by various CI and analysis tools
 // Code Climate Engine Specification https://github.com/codeclimate/platform/blob/master/spec/analyzers/SPEC.md
 class CodeClimateReporter implements Reporter {
   final Config reportConfig;
@@ -40,13 +40,24 @@ class CodeClimateReporter implements Reporter {
       }),
     ];
 
+    return result
+      ..addAll(_functionMetrics(record))
+      ..addAll(record.issues.map((issue) =>
+          CodeClimateIssue.fromCodeIssue(issue, record.relativePath)))
+      ..addAll(record.designIssues.map((issue) =>
+          CodeClimateIssue.fromDesignIssue(issue, record.relativePath)));
+  }
+
+  Iterable<CodeClimateIssue> _functionMetrics(FileRecord record) {
+    final issues = <CodeClimateIssue>[];
+
     for (final key in record.functions.keys) {
       final func = record.functions[key];
       final report = UtilitySelector.functionReport(func, reportConfig);
 
       if (UtilitySelector.isIssueLevel(
           report.cyclomaticComplexity.violationLevel)) {
-        result.add(CodeClimateIssue.cyclomaticComplexity(
+        issues.add(CodeClimateIssue.cyclomaticComplexity(
           func,
           report.cyclomaticComplexity.value,
           record.relativePath,
@@ -57,7 +68,7 @@ class CodeClimateReporter implements Reporter {
 
       if (UtilitySelector.isIssueLevel(
           report.maintainabilityIndex.violationLevel)) {
-        result.add(CodeClimateIssue.maintainabilityIndex(
+        issues.add(CodeClimateIssue.maintainabilityIndex(
           func,
           report.maintainabilityIndex.value.toInt(),
           record.relativePath,
@@ -66,12 +77,6 @@ class CodeClimateReporter implements Reporter {
       }
     }
 
-    result
-      ..addAll(record.issues.map((issue) =>
-          CodeClimateIssue.fromCodeIssue(issue, record.relativePath)))
-      ..addAll(record.designIssues.map((issue) =>
-          CodeClimateIssue.fromDesignIssue(issue, record.relativePath)));
-
-    return result;
+    return issues;
   }
 }