commit 6824371d2fba6b3eae468d7b829ce7872ba47ecf
author Sam Rawlins <srawlins@google.com> Tue May 14 15:23:08 2024 +0000
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue May 14 15:23:08 2024 +0000
tree 2f3ed13cf4f42391280ed6dec821f767c3199ada
parent 9f94984af24520bd659fe2b1c2c3e5dd1792d6a7

analyzer: simplify _computeLints

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>

pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart

diff --git a/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart b/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart
index b590bfd..89d816e 100644
--- a/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart
@@ -328,8 +328,7 @@
         allUnits.add(linterUnit);
       }
       for (var unitAnalysis in _libraryUnits.values) {
-        _computeLints(unitAnalysis, unitAnalysis.linterUnit, allUnits,
-            analysisOptions: _analysisOptions);
+        _computeLints(unitAnalysis, allUnits);
       }
     }
 
@@ -350,18 +349,17 @@
 
   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(
@@ -371,10 +369,10 @@
       _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();
@@ -387,7 +385,7 @@
       LinterVisitor(
         nodeRegistry,
         LinterExceptionHandler(
-          propagateExceptions: analysisOptions.propagateLinterExceptions,
+          propagateExceptions: _analysisOptions.propagateLinterExceptions,
         ).logException,
       ),
     );