Skip to content

Commit

Permalink
analyzer: simplify _computeLints
Browse files Browse the repository at this point in the history
It doesn't need an `analysisOptions` parameter, as that is an instance
variable.

It doesn't need the LinterContextUnit, as that is fetched from the
UnitAnalysis object.

Cq-Include-Trybots: luci.dart.try:flutter-analyze-try,analyzer-win-release-try,pkg-win-release-try
Change-Id: Id375ea5c727617cd6dc806bc2885da389aa9e691
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/366222
Commit-Queue: Phil Quitslund <pquitslund@google.com>
Auto-Submit: Samuel Rawlins <srawlins@google.com>
Reviewed-by: Phil Quitslund <pquitslund@google.com>
  • Loading branch information
srawlins authored and Commit Queue committed May 14, 2024
1 parent 9f94984 commit 6824371
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart
Expand Up @@ -328,8 +328,7 @@ class LibraryAnalyzer {
allUnits.add(linterUnit);
}
for (var unitAnalysis in _libraryUnits.values) {
_computeLints(unitAnalysis, unitAnalysis.linterUnit, allUnits,
analysisOptions: _analysisOptions);
_computeLints(unitAnalysis, allUnits);
}
}

Expand All @@ -350,18 +349,17 @@ class LibraryAnalyzer {

void _computeLints(
UnitAnalysis unitAnalysis,
LinterContextUnit currentUnit,
List<LinterContextUnit> allUnits, {
required AnalysisOptionsImpl analysisOptions,
}) {
List<LinterContextUnit> allUnits,
) {
// Skip computing lints on macro generated augmentations.
// See: https://github.com/dart-lang/sdk/issues/54875
if (unitAnalysis.file.isMacroAugmentation) return;

var currentUnit = unitAnalysis.linterUnit;
var unit = currentUnit.unit;
var errorReporter = unitAnalysis.errorReporter;

var enableTiming = analysisOptions.enableTiming;
var enableTiming = _analysisOptions.enableTiming;
var nodeRegistry = NodeLintRegistry(enableTiming);

var context = LinterContextImpl(
Expand All @@ -371,10 +369,10 @@ class LibraryAnalyzer {
_typeProvider,
_typeSystem,
_inheritance,
analysisOptions,
_analysisOptions,
unitAnalysis.file.workspacePackage,
);
for (var linter in analysisOptions.lintRules) {
for (var linter in _analysisOptions.lintRules) {
linter.reporter = errorReporter;
var timer = enableTiming ? lintRegistry.getTimer(linter) : null;
timer?.start();
Expand All @@ -387,7 +385,7 @@ class LibraryAnalyzer {
LinterVisitor(
nodeRegistry,
LinterExceptionHandler(
propagateExceptions: analysisOptions.propagateLinterExceptions,
propagateExceptions: _analysisOptions.propagateLinterExceptions,
).logException,
),
);
Expand Down

0 comments on commit 6824371

Please sign in to comment.