revert: Changed the supported analyzer version to ^2.1.0.

Author: dkrutskikh

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.2.0-dev.4
+
+* Revert: Changed the supported `analyzer` version to `^2.1.0`.
+
 ## 4.2.0-dev.3
 
 * Changed the supported `analyzer` version to `^2.1.0`.

lib/src/analyzer_plugin/analyzer_plugin.dart

@@ -97,9 +97,7 @@ class MetricsAnalyzerPlugin extends ServerPlugin {
     runZonedGuarded(
       () {
         dartDriver.results.listen((analysisResult) {
-          if (analysisResult is ResolvedUnitResult) {
-            _processResult(dartDriver, analysisResult);
-          }
+          _processResult(dartDriver, analysisResult);
         });
       },
       (e, stackTrace) {
@@ -171,19 +169,22 @@ class MetricsAnalyzerPlugin extends ServerPlugin {
     ResolvedUnitResult analysisResult,
   ) {
     try {
-      if (driver.analysisContext?.contextRoot.isAnalyzed(analysisResult.path) ??
-          false) {
+      final path = analysisResult.path;
+      if (analysisResult.unit != null &&
+          path != null &&
+          (driver.analysisContext?.contextRoot.isAnalyzed(path) ?? false)) {
         final fixes = _check(driver, analysisResult);
 
         channel.sendNotification(
           plugin.AnalysisErrorsParams(
-            analysisResult.path,
+            path,
             fixes.map((fix) => fix.error).toList(),
           ).toNotification(),
         );
       } else {
         channel.sendNotification(
-          plugin.AnalysisErrorsParams(analysisResult.path, []).toNotification(),
+          plugin.AnalysisErrorsParams(analysisResult.path!, [])
+              .toNotification(),
         );
       }
     } on Exception catch (e, stackTrace) {

lib/src/analyzers/lint_analyzer/lint_analyzer.dart

@@ -105,7 +105,7 @@ class LintAnalyzer {
           filePaths.intersection(context.contextRoot.analyzedFiles().toSet());
 
       for (final filePath in analyzedFiles) {
-        final unit = await context.currentSession.getResolvedUnit(filePath);
+        final unit = await context.currentSession.getResolvedUnit2(filePath);
         if (unit is ResolvedUnitResult) {
           final result = _runAnalysisForFile(
             unit,
@@ -130,14 +130,19 @@ class LintAnalyzer {
     String rootFolder, {
     String? filePath,
   }) {
-    if (result.state == ResultState.VALID &&
+    final unit = result.unit;
+    final content = result.content;
+
+    if (unit != null &&
+        content != null &&
+        result.state == ResultState.VALID &&
         filePath != null &&
         _isSupported(result)) {
-      final ignores = Suppression(result.content, result.lineInfo);
+      final ignores = Suppression(content, result.lineInfo);
       final internalResult = InternalResolvedUnitResult(
         filePath,
-        result.content,
-        result.unit,
+        content,
+        unit,
         result.lineInfo,
       );
       final relativePath = relative(filePath, from: rootFolder);
@@ -433,5 +438,7 @@ class LintAnalyzer {
   }
 
   bool _isSupported(AnalysisResult result) =>
-      result.path.endsWith('.dart') && !result.path.endsWith('.g.dart');
+      result.path != null &&
+      result.path!.endsWith('.dart') &&
+      !result.path!.endsWith('.g.dart');
 }

lib/src/analyzers/unused_files_analyzer/unused_files_analyzer.dart

@@ -67,7 +67,7 @@ class UnusedFilesAnalyzer {
           filePaths.intersection(context.contextRoot.analyzedFiles().toSet());
 
       for (final filePath in analyzedFiles) {
-        final unit = await context.currentSession.getResolvedUnit(filePath);
+        final unit = await context.currentSession.getResolvedUnit2(filePath);
         unusedFiles.removeAll(_analyzeFile(filePath, unit));
       }
 
@@ -95,7 +95,7 @@ class UnusedFilesAnalyzer {
   Iterable<String> _analyzeFile(String filePath, SomeResolvedUnitResult unit) {
     if (unit is ResolvedUnitResult) {
       final visitor = UnusedFilesVisitor(filePath);
-      unit.unit.visitChildren(visitor);
+      unit.unit?.visitChildren(visitor);
 
       return visitor.paths;
     }

pubspec.yaml

@@ -9,7 +9,7 @@ environment:
   sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
-  analyzer: ^2.1.0
+  analyzer: 2.0.0
   analyzer_plugin: ^0.7.0
   ansicolor: ^2.0.1
   args: ^2.0.0

test/helpers/file_resolver.dart

@@ -28,8 +28,8 @@ class FileResolver {
 
     return InternalResolvedUnitResult(
       path,
-      parseResult.content,
-      parseResult.unit,
+      parseResult.content!,
+      parseResult.unit!,
       parseResult.lineInfo,
     );
   }