linter: Remove unnecessary DiagnosticInfo class

Change-Id: Iac32c119288d2aab9549f01880d11c9e237ba9c3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/444782
Commit-Queue: Samuel Rawlins <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: srawlins

pkg/linter/lib/src/test_utilities/analysis_error_info.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/diagnostic/diagnostic.dart';
-import 'package:analyzer/source/line_info.dart';
-import 'package:linter/src/test_utilities/analysis_error_info.dart';
+import 'package:analyzer/file_system/physical_file_system.dart';
+import 'package:analyzer/source/file_source.dart';
 import 'package:test/test.dart';
 import 'package:test_descriptor/test_descriptor.dart' as d;
 
@@ -16,73 +16,62 @@ void main() {
 }
 
 void defineTests() {
-  group('formatter', () {
-    test('pluralize', () {
-      expect(pluralize('issue', 0), '0 issues');
-      expect(pluralize('issue', 1), '1 issue');
-      expect(pluralize('issue', 2), '2 issues');
-    });
-
-    group('reporter', () {
-      late DiagnosticInfo info;
-      late StringBuffer out;
-      late String sourcePath;
-      late ReportFormatter reporter;
-
-      setUp(() async {
-        var lineInfo = LineInfo([3, 6, 9]);
-
-        var type = MockDiagnosticType()..displayName = 'test';
-
-        var code = TestDiagnosticCode('mock_code', 'MSG')..type = type;
-
-        await d.dir('project', [
-          d.file('foo.dart', '''
+  group(ReportFormatter, () {
+    late Diagnostic diagnostic;
+    late StringBuffer out;
+    late String sourcePath;
+    late ReportFormatter reporter;
+
+    setUp(() async {
+      var type = MockDiagnosticType()..displayName = 'test';
+      var code = TestDiagnosticCode('mock_code', 'MSG')..type = type;
+
+      await d.dir('project', [
+        d.file('foo.dart', '''
 var x = 11;
 var y = 22;
 var z = 33;
 '''),
-        ]).create();
-        sourcePath = '${d.sandbox}/project/foo.dart';
-        var source = MockSource(sourcePath);
-
-        var error = Diagnostic.tmp(
-          source: source,
-          offset: 10,
-          length: 3,
-          diagnosticCode: code,
-        );
-
-        info = DiagnosticInfo([error], lineInfo);
-        out = StringBuffer();
-        reporter = ReportFormatter([info], out)..write();
-      });
+      ]).create();
+      sourcePath = '${d.sandbox}/project/foo.dart';
+      var file = PhysicalResourceProvider.INSTANCE.getFile(sourcePath);
+      var source = FileSource(file);
+
+      diagnostic = Diagnostic.tmp(
+        source: source,
+        offset: 25,
+        length: 3,
+        diagnosticCode: code,
+      );
+
+      out = StringBuffer();
+      reporter = ReportFormatter([diagnostic], out)..write();
+    });
 
-      test('count', () {
-        expect(reporter.errorCount, 1);
-      });
+    test('count', () {
+      expect(reporter.diagnosticCount, 1);
+    });
 
-      test('write', () {
-        expect(out.toString().trim(), '''$sourcePath 3:2 [test] MSG
+    test('write', () {
+      expect(out.toString().trim(), '''$sourcePath 3:2 [test] MSG
 var z = 33;
  ^^^
 
 files analyzed, 1 issue found.''');
-      });
+    });
 
-      test('stats', () {
-        out.clear();
-        ReportFormatter([info], out).write();
-        expect(
-          out.toString(),
-          startsWith('''$sourcePath 3:2 [test] MSG
+    test('stats', () {
+      out.clear();
+      ReportFormatter([diagnostic], out).write();
+      expect(
+        out.toString(),
+        startsWith('''$sourcePath 3:2 [test] MSG
 var z = 33;
  ^^^
 
 files analyzed, 1 issue found.
 '''),
-        );
-      });
+      );
     });
   });
 }

pkg/linter/test/formatter_test.dart

@@ -6,8 +6,6 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:analyzer/error/error.dart';
-import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/generated/source.dart';
 
 class MockDiagnosticType implements DiagnosticType {
   @override
@@ -64,22 +62,6 @@ class MockIOSink implements IOSink {
   void writeln([Object? obj = '']) {}
 }
 
-class MockSource extends BasicSource {
-  @override
-  final String fullName;
-
-  MockSource(this.fullName) : super(Uri.file(fullName));
-
-  @override
-  TimestampedData<String> get contents => TimestampedData<String>(0, '');
-
-  @override
-  bool exists() => false;
-
-  @override
-  dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
-}
-
 class TestDiagnosticCode extends DiagnosticCode {
   @override
   late DiagnosticSeverity severity;

pkg/linter/test/mocks.dart

@@ -7,6 +7,7 @@ import 'dart:io';
 import 'dart:math' as math;
 
 import 'package:analyzer/analysis_rule/analysis_rule.dart';
+import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/src/lint/analysis_rule_timers.dart';
 import 'package:analyzer/src/lint/config.dart';
 import 'package:analyzer/src/lint/io.dart';
@@ -15,7 +16,6 @@ import 'package:analyzer/src/util/file_paths.dart' as file_paths;
 import 'package:args/args.dart';
 import 'package:linter/src/extensions.dart';
 import 'package:linter/src/rules.dart';
-import 'package:linter/src/test_utilities/analysis_error_info.dart';
 import 'package:path/path.dart' as path;
 import 'package:yaml/yaml.dart';
 
@@ -212,13 +212,10 @@ Future<void> writeBenchmarks(
   out.writeTimings(stats, 0);
 }
 
-int _maxSeverity(List<DiagnosticInfo> infos) {
-  var filteredErrors = infos.expand((i) => i.diagnostics);
-  return filteredErrors.fold(
-    0,
-    (value, e) => math.max(value, e.diagnosticCode.severity.ordinal),
-  );
-}
+int _maxSeverity(List<Diagnostic> diagnostics) => diagnostics.fold(
+  0,
+  (value, e) => math.max(value, e.diagnosticCode.severity.ordinal),
+);
 
 class Stat implements Comparable<Stat> {
   final String name;

pkg/linter/tool/benchmark.dart

@@ -14,7 +14,6 @@ import 'package:analyzer/src/dart/analysis/driver_based_analysis_context.dart';
 import 'package:analyzer/src/lint/registry.dart';
 import 'package:cli_util/cli_logging.dart';
 import 'package:linter/src/analyzer.dart';
-import 'package:linter/src/test_utilities/analysis_error_info.dart';
 import 'package:path/path.dart' as path;
 
 import '../../test/mocks.dart';
@@ -78,7 +77,7 @@ class Driver {
         resourceProvider: resourceProvider,
       );
 
-      var errors = <DiagnosticInfo>[];
+      var diagnostics = <Diagnostic>[];
 
       for (var context in collection.contexts) {
         // Add lints.
@@ -95,7 +94,7 @@ class Driver {
             try {
               var result = await context.currentSession.getErrors(filePath);
               if (result is ErrorsResult) {
-                errors.add(DiagnosticInfo(result.diagnostics, result.lineInfo));
+                diagnostics.addAll(result.diagnostics);
               }
             } on Exception catch (e) {
               _print('Exception caught analyzing: $filePath');
@@ -104,11 +103,9 @@ class Driver {
           }
         }
       }
-      ReportFormatter(errors, silent ? MockIOSink() : io.stdout).write();
+      ReportFormatter(diagnostics, silent ? MockIOSink() : io.stdout).write();
 
-      for (var info in errors) {
-        failedChecks.addAll(info.diagnostics);
-      }
+      failedChecks.addAll(diagnostics);
     }
 
     // Unregister our checks.

pkg/linter/tool/checks/driver.dart

@@ -5,13 +5,13 @@
 import 'dart:io' as io;
 
 import 'package:analyzer/dart/analysis/results.dart';
+import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/physical_file_system.dart' as file_system;
 import 'package:analyzer/instrumentation/instrumentation.dart';
 import 'package:analyzer/src/dart/analysis/analysis_context_collection.dart';
 import 'package:analyzer/src/generated/engine.dart' show AnalysisEngine;
 import 'package:analyzer/src/lint/io.dart';
-import 'package:linter/src/test_utilities/analysis_error_info.dart';
 
 import 'linter_options.dart';
 
@@ -27,7 +27,7 @@ class LintDriver {
   ResourceProvider get _resourceProvider =>
       file_system.PhysicalResourceProvider.INSTANCE;
 
-  Future<List<DiagnosticInfo>> analyze(Iterable<io.File> files) async {
+  Future<List<Diagnostic>> analyze(Iterable<io.File> files) async {
     AnalysisEngine.instance.instrumentationService = _StdInstrumentation();
 
     var filesPaths =
@@ -49,14 +49,12 @@ class LintDriver {
 
     _filesAnalyzed.addAll(filesPaths);
 
-    var result = <DiagnosticInfo>[];
+    var result = <Diagnostic>[];
     for (var path in _filesAnalyzed) {
       var analysisSession = contextCollection.contextFor(path).currentSession;
       var errorsResult = await analysisSession.getErrors(path);
       if (errorsResult is ErrorsResult) {
-        result.add(
-          DiagnosticInfo(errorsResult.diagnostics, errorsResult.lineInfo),
-        );
+        result.addAll(errorsResult.diagnostics);
       }
     }
     return result;

pkg/linter/tool/lint_driver.dart

@@ -11,7 +11,6 @@ import 'package:analyzer/source/file_source.dart';
 import 'package:analyzer/source/source.dart';
 import 'package:analyzer/src/lint/pub.dart';
 import 'package:analyzer/src/util/file_paths.dart' as file_paths;
-import 'package:linter/src/test_utilities/analysis_error_info.dart';
 import 'package:path/path.dart' as path;
 
 import 'lint_driver.dart';
@@ -32,7 +31,7 @@ class TestLinter implements DiagnosticListener {
   path.Context get _pathContext =>
       file_system.PhysicalResourceProvider.INSTANCE.pathContext;
 
-  Future<List<DiagnosticInfo>> lintFiles(List<File> files) async {
+  Future<List<Diagnostic>> lintFiles(List<File> files) async {
     var lintDriver = LintDriver(options);
     var errors = await lintDriver.analyze(
       files.where((f) => f.path.endsWith('.dart')),

pkg/linter/tool/test_linter.dart

@@ -7,10 +7,7 @@ import 'dart:math';
 
 import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/source/line_info.dart';
-import 'package:linter/src/test_utilities/analysis_error_info.dart';
-
-String pluralize(String word, int count) =>
-    "$count ${count == 1 ? word : '${word}s'}";
+import 'package:analyzer/src/utilities/extensions/string.dart';
 
 String _getLineContents(int lineNumber, Diagnostic diagnostic) {
   var path = diagnostic.source.fullName;
@@ -32,11 +29,11 @@ String _getLineContents(int lineNumber, Diagnostic diagnostic) {
 
 class ReportFormatter {
   final StringSink out;
-  final Iterable<DiagnosticInfo> errors;
+  final Iterable<Diagnostic> diagnostics;
 
-  int errorCount = 0;
+  int diagnosticCount = 0;
 
-  ReportFormatter(this.errors, this.out);
+  ReportFormatter(this.diagnostics, this.out);
 
   /// Override to influence diagnostic sorting.
   int compare(Diagnostic diagnostic1, Diagnostic diagnostic2) {
@@ -88,8 +85,9 @@ class ReportFormatter {
     out.writeln(result);
   }
 
-  void _writeLint(Diagnostic diagnostic, LineInfo lineInfo) {
+  void _writeLint(Diagnostic diagnostic) {
     var offset = diagnostic.offset;
+    var lineInfo = LineInfo.fromContent(diagnostic.source.contents.data);
     var location = lineInfo.getLocation(offset);
     var line = location.lineNumber;
     var column = location.columnNumber;
@@ -98,17 +96,18 @@ class ReportFormatter {
   }
 
   void _writeLints() {
-    for (var info in errors) {
-      for (var e in (info.diagnostics.toList()..sort(compare))) {
-        ++errorCount;
-        _writeLint(e, info.lineInfo);
-      }
+    for (var e in (diagnostics.toList()..sort(compare))) {
+      ++diagnosticCount;
+      _writeLint(e);
     }
+
     out.writeln();
   }
 
   void _writeSummary() {
-    var summary = 'files analyzed, ${pluralize("issue", errorCount)} found.';
+    var summary =
+        'files analyzed, '
+        '$diagnosticCount ${"issue".pluralized(diagnosticCount)} found.';
     out.writeln(summary);
   }
 }