Skip to content
This repository was archived by the owner on Jul 16, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* feat: improve static code diagnostic `prefer-extracting-callbacks`: don't trigger on empty function blocks and ignore Flutter builder functions.
* feat: improve unused files check, add support for `vm:entry-point` annotation.
* fix: compute NumberOfParametersMetric only for functions and methods.
* fix: skip synthetic tokens while compute 'Source lines of Code'.

## 4.3.3

Expand Down
8 changes: 2 additions & 6 deletions lib/src/analyzers/lint_analyzer/metrics/metrics_factory.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,10 @@ final _implementedMetrics = <String, Metric Function(Map<String, Object>)>{

Iterable<Metric> getMetrics({
required Map<String, Object> config,
Iterable<String> patternsDependencies = const [],
EntityType? measuredType,
}) {
final _metrics = _implementedMetrics.keys.map(
(id) => _implementedMetrics[id]!(
!patternsDependencies.contains(id) ? config : {},
),
);
final _metrics =
_implementedMetrics.keys.map((id) => _implementedMetrics[id]!(config));

return measuredType != null
? _metrics
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ class SourceCodeVisitor extends RecursiveAstVisitor<void> {
void _collectFunctionBodyData(Token? firstToken, Token? lastToken) {
var token = firstToken;
while (token != lastToken && token != null) {
_linesWithCode.add(_lineInfo.getLocation(token.offset).lineNumber);
if (!token.isSynthetic) {
_linesWithCode.add(_lineInfo.getLocation(token.offset).lineNumber);
}

token = token.next;
}
}
Expand Down
49 changes: 20 additions & 29 deletions lib/src/config_builder/config_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,35 +25,26 @@ class ConfigBuilder {
String excludesRootFolder, {
Iterable<Metric<num>>? classMetrics,
Iterable<Metric<num>>? functionMetrics,
}) {
final patterns = getPatternsById(config);
final patternsDependencies = patterns
.map((pattern) => pattern.dependentMetricIds)
.expand((e) => e)
.toSet();

return LintAnalysisConfig(
prepareExcludes(config.excludePatterns, excludesRootFolder),
getRulesById(config.rules),
prepareExcludes(config.excludeForRulesPatterns, excludesRootFolder),
patterns,
classMetrics ??
getMetrics(
config: config.metrics,
patternsDependencies: patternsDependencies,
measuredType: EntityType.classEntity,
),
functionMetrics ??
getMetrics(
config: config.metrics,
patternsDependencies: patternsDependencies,
measuredType: EntityType.methodEntity,
),
prepareExcludes(config.excludeForMetricsPatterns, excludesRootFolder),
config.metrics,
excludesRootFolder,
);
}
}) =>
LintAnalysisConfig(
prepareExcludes(config.excludePatterns, excludesRootFolder),
getRulesById(config.rules),
prepareExcludes(config.excludeForRulesPatterns, excludesRootFolder),
getPatternsById(config),
classMetrics ??
getMetrics(
config: config.metrics,
measuredType: EntityType.classEntity,
),
functionMetrics ??
getMetrics(
config: config.metrics,
measuredType: EntityType.methodEntity,
),
prepareExcludes(config.excludeForMetricsPatterns, excludesRootFolder),
config.metrics,
excludesRootFolder,
);

static UnusedFilesConfig getUnusedFilesConfigFromArgs(
Iterable<String> excludePatterns,
Expand Down