[analyzer] Move DiagnosticReporter into src/.

In a follow-up CL, I plan to add an extension on `DiagnosticReporter`
that's not exposed through the analyzer public API, so that we can try
out the analyzer's new literate API for diagnostic reporting without
exposing it to analyzer clients yet. The extension will need to be in
the same library as `DiagnosticReporter` (so that it can access a
private method), so in order to avoid exposing the extension through
the analyzer public API, that library will need to be in `src/`.

From the point of view of analyzer clients, this change is a no-op;
the `DiagnosticReporter` class is still available from
`package:analyzer/error/listener.dart` by way of an export directive.

Change-Id: I6a6a696426f43ee57789b8a7ec1c36bc0b8680ef
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/446100
Commit-Queue: Paul Berry <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>

Author: stereotype441

pkg/analyzer/lib/error/listener.dart

@@ -2,19 +2,11 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:analyzer/dart/ast/ast.dart'
-    show AstNode, ConstructorDeclaration;
-import 'package:analyzer/dart/ast/syntactic_entity.dart';
-import 'package:analyzer/dart/ast/token.dart';
-import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/diagnostic/diagnostic.dart';
-import 'package:analyzer/error/error.dart';
 import 'package:analyzer/source/source.dart';
 import 'package:analyzer/src/error/listener.dart';
-import 'package:analyzer/src/utilities/extensions/collection.dart';
-import 'package:meta/meta.dart';
-import 'package:source_span/source_span.dart';
+
+export 'package:analyzer/src/error/listener.dart' show DiagnosticReporter;
 
 @Deprecated("Use 'BooleanDiagnosticListener' instead")
 typedef BooleanErrorListener = BooleanDiagnosticListener;
@@ -69,248 +61,6 @@ abstract class DiagnosticListener implements DiagnosticOrErrorListener {
 
 sealed class DiagnosticOrErrorListener {}
 
-/// An object used to create diagnostics and report them to a diagnostic
-/// listener.
-class DiagnosticReporter {
-  /// The diagnostic listener to which diagnostics are reported.
-  final DiagnosticOrErrorListener _diagnosticListener;
-
-  /// The source to be used when reporting diagnostics.
-  final Source _source;
-
-  /// The lock level; if greater than zero, no diagnostic will be reported.
-  ///
-  /// This is used to prevent reporting diagnostics inside comments.
-  @internal
-  int lockLevel = 0;
-
-  /// Initializes a newly created error reporter that will report diagnostics to the
-  /// given [_diagnosticListener].
-  ///
-  /// Diagnostics are reported against the [_source] unless another source is
-  /// provided later.
-  DiagnosticReporter(this._diagnosticListener, this._source);
-
-  Source get source => _source;
-
-  /// Reports a diagnostic with the given [diagnosticCode] and [arguments].
-  ///
-  /// The location of the diagnostic will be the name of the [node].
-  ///
-  /// The reported [Diagnostic] is returned so that the caller may attach
-  /// additional information to it (for example, using an expando).
-  Diagnostic atConstructorDeclaration(
-    ConstructorDeclaration node,
-    DiagnosticCode diagnosticCode, {
-    List<Object>? arguments,
-    List<DiagnosticMessage>? contextMessages,
-    @Deprecated('Use an expando instead') Object? data,
-  }) {
-    // TODO(brianwilkerson): Consider extending this method to take any
-    //  declaration and compute the correct range for the name of that
-    //  declaration. This might make it easier to be consistent.
-    if (node.name case var nameToken?) {
-      var offset = node.returnType.offset;
-      return atOffset(
-        offset: offset,
-        length: nameToken.end - offset,
-        diagnosticCode: diagnosticCode,
-        arguments: arguments,
-      );
-    } else {
-      return atNode(node.returnType, diagnosticCode, arguments: arguments);
-    }
-  }
-
-  /// Reports a diagnostic with the given [diagnosticCode] and [arguments].
-  ///
-  /// The [element] is used to compute the location of the diagnostic.
-  ///
-  /// The reported [Diagnostic] is returned so that the caller may attach
-  /// additional information to it (for example, using an expando).
-  @experimental
-  Diagnostic atElement2(
-    Element element,
-    DiagnosticCode diagnosticCode, {
-    List<Object>? arguments,
-    List<DiagnosticMessage>? contextMessages,
-    @Deprecated('Use an expando instead') Object? data,
-  }) {
-    var nonSynthetic = element.nonSynthetic;
-    return atOffset(
-      diagnosticCode: diagnosticCode,
-      offset: nonSynthetic.firstFragment.nameOffset ?? -1,
-      length: nonSynthetic.name?.length ?? 0,
-      arguments: arguments,
-      contextMessages: contextMessages,
-      // ignore: deprecated_member_use_from_same_package
-      data: data,
-    );
-  }
-
-  /// Reports a diagnostic with the given [diagnosticCode] and [arguments].
-  ///
-  /// The [entity] is used to compute the location of the diagnostic.
-  ///
-  /// The reported [Diagnostic] is returned so that the caller may attach
-  /// additional information to it (for example, using an expando).
-  Diagnostic atEntity(
-    SyntacticEntity entity,
-    DiagnosticCode diagnosticCode, {
-    List<Object>? arguments,
-    List<DiagnosticMessage>? contextMessages,
-    @Deprecated('Use an expando instead') Object? data,
-  }) {
-    return atOffset(
-      diagnosticCode: diagnosticCode,
-      offset: entity.offset,
-      length: entity.length,
-      arguments: arguments,
-      contextMessages: contextMessages,
-      // ignore: deprecated_member_use_from_same_package
-      data: data,
-    );
-  }
-
-  /// Reports a diagnostic with the given [diagnosticCode] and [arguments].
-  ///
-  /// The [node] is used to compute the location of the diagnostic.
-  ///
-  /// The reported [Diagnostic] is returned so that the caller may attach
-  /// additional information to it (for example, using an expando).
-  Diagnostic atNode(
-    AstNode node,
-    DiagnosticCode diagnosticCode, {
-    List<Object>? arguments,
-    List<DiagnosticMessage>? contextMessages,
-    @Deprecated('Use an expando instead') Object? data,
-  }) {
-    return atOffset(
-      diagnosticCode: diagnosticCode,
-      offset: node.offset,
-      length: node.length,
-      arguments: arguments,
-      contextMessages: contextMessages,
-      // ignore: deprecated_member_use_from_same_package
-      data: data,
-    );
-  }
-
-  /// Reports a diagnostic with the given [diagnosticCode] (or [errorCode],
-  /// deprecated) and [arguments].
-  ///
-  /// The location of the diagnostic is specified by the given [offset] and
-  /// [length].
-  ///
-  /// The reported [Diagnostic] is returned so that the caller may attach
-  /// additional information to it (for example, using an expando).
-  Diagnostic atOffset({
-    required int offset,
-    required int length,
-    @Deprecated("Use 'diagnosticCode' instead") DiagnosticCode? errorCode,
-    DiagnosticCode? diagnosticCode,
-    List<Object>? arguments,
-    List<DiagnosticMessage>? contextMessages,
-    @Deprecated('Use an expando instead') Object? data,
-  }) {
-    if ((errorCode == null && diagnosticCode == null) ||
-        (errorCode != null && diagnosticCode != null)) {
-      throw ArgumentError(
-        "Exactly one of 'errorCode' (deprecated) and 'diagnosticCode' should be given",
-      );
-    }
-
-    diagnosticCode ??= errorCode!;
-
-    if (arguments != null) {
-      var invalid =
-          arguments
-              .whereNotType<String>()
-              .whereNotType<DartType>()
-              .whereNotType<Element>()
-              .whereNotType<int>()
-              .whereNotType<Uri>();
-      if (invalid.isNotEmpty) {
-        throw ArgumentError(
-          'Tried to format a diagnostic using '
-          '${invalid.map((e) => e.runtimeType).join(', ')}',
-        );
-      }
-    }
-
-    contextMessages ??= [];
-    contextMessages.addAll(convertTypeNames(arguments));
-    var diagnostic = Diagnostic.tmp(
-      source: _source,
-      offset: offset,
-      length: length,
-      diagnosticCode: diagnosticCode,
-      arguments: arguments ?? const [],
-      contextMessages: contextMessages,
-      // ignore: deprecated_member_use
-      data: data,
-    );
-    reportError(diagnostic);
-    return diagnostic;
-  }
-
-  /// Reports a diagnostic with the given [diagnosticCode] and [arguments].
-  ///
-  /// The [span] is used to compute the location of the diagnostic.
-  ///
-  /// The reported [Diagnostic] is returned so that the caller may attach
-  /// additional information to it (for example, using an expando).
-  Diagnostic atSourceSpan(
-    SourceSpan span,
-    DiagnosticCode diagnosticCode, {
-    List<Object>? arguments,
-    List<DiagnosticMessage>? contextMessages,
-    @Deprecated('Use an expando instead') Object? data,
-  }) {
-    return atOffset(
-      diagnosticCode: diagnosticCode,
-      offset: span.start.offset,
-      length: span.length,
-      arguments: arguments,
-      contextMessages: contextMessages,
-      // ignore: deprecated_member_use_from_same_package
-      data: data,
-    );
-  }
-
-  /// Reports a diagnostic with the given [diagnosticCode] and [arguments].
-  ///
-  /// The [token] is used to compute the location of the diagnostic.
-  ///
-  /// The reported [Diagnostic] is returned so that the caller may attach
-  /// additional information to it (for example, using an expando).
-  Diagnostic atToken(
-    Token token,
-    DiagnosticCode diagnosticCode, {
-    List<Object>? arguments,
-    List<DiagnosticMessage>? contextMessages,
-    @Deprecated('Use an expando instead') Object? data,
-  }) {
-    return atOffset(
-      diagnosticCode: diagnosticCode,
-      offset: token.offset,
-      length: token.length,
-      arguments: arguments,
-      contextMessages: contextMessages,
-      // ignore: deprecated_member_use_from_same_package
-      data: data,
-    );
-  }
-
-  /// Report the given [diagnostic].
-  void reportError(Diagnostic diagnostic) {
-    if (lockLevel != 0) {
-      return;
-    }
-    _diagnosticListener.onDiagnostic(diagnostic);
-  }
-}
-
 /// A diagnostic listener that records the diagnostics that are reported to it
 /// in a way that is appropriate for caching those diagnostic within an
 /// analysis context.

pkg/analyzer/lib/src/dart/resolver/extension_member_resolver.dart

@@ -6,7 +6,6 @@ import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/ast/syntactic_entity.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
 import 'package:analyzer/src/dart/element/element.dart';