dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

CQ. Move analyzer diagnostics back into analyzer.

Browse Source 
Move the analyzer-only Diagnostic, DiagnosticMessage, Severity, and
locatable diagnostic helper types out of _fe_analyzer_shared and into
package:analyzer.

I paln to make changes outlined in
https://github.com/dart-lang/sdk/issues/63311 and chat discussion.
Keeping these classes in the analyzer simplifies the migration and
avoids introducing a shared abstraction before there is a concrete need
for one.

If we decide later need to have a shared abstraction, we can always
extract one at that point. With coding agents internal code motion is
cheap.

Update analyzer, analysis server plugin, analyzer plugin, linter, and
scanner call sites to import the moved APIs from analyzer libraries, and
refresh API baselines to reflect the new public owner.

Change-Id: Ie0ef0f01c6e4be7ebaac25619ac3e3fe991a44d9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/501000
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Reviewed-by: Paul Berry <paulberry@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
Konstantin Shcheglov
2026-05-07 13:54:59 -07:00
committed by dart-scoped@luci-project-accounts.iam.gserviceaccount.com
parent 9b2fc36886
commit 1309dffc0a
34 changed files with 563 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/_fe_analyzer_shared/lib/src/base/diagnostic_message.dart
-90
View File
@@ -1,90 +0,0 @@
// Copyright (c) 2025, the Dart project authors. Please see the AUTHORS file
// 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:_fe_analyzer_shared/src/base/analyzer_public_api.dart';
import 'package:_fe_analyzer_shared/src/base/errors.dart';
/// A single message associated with a [Diagnostic], consisting of the text of
/// the message and the location associated with it.
///
/// Clients may not extend, implement or mix-in this class.
@AnalyzerPublicApi(
message: 'Exported by package:analyzer/diagnostic/diagnostic.dart',
)
abstract class DiagnosticMessage {
/// The absolute and normalized path of the file associated with this message.
String get filePath;
/// The length of the source range associated with this message.
int get length;
/// The zero-based offset from the start of the file to the beginning of the
/// source range associated with this message.
int get offset;
/// The URL containing documentation about this diagnostic message, if any.
///
/// Note: this should not be confused with the location in the user's code
/// where the error was reported; that information can be obtained from
/// [filePath], [length], and [offset].
String? get url;
/// Gets the text of the message.
///
/// If [includeUrl] is `true`, and this diagnostic message has an associated
/// URL, it is included in the returned value in a human-readable way.
/// Clients that wish to present URLs as simple text can do this. If
/// [includeUrl] is `false`, no URL is included in the returned value.
/// Clients that have a special mechanism for presenting URLs (e.g. as a
/// clickable link) should do this and then consult the [url] getter to access
/// the URL.
String messageText({required bool includeUrl});
}
/// A concrete implementation of a diagnostic message.
class DiagnosticMessageImpl implements DiagnosticMessage {
@override
final String filePath;
@override
final int length;
final String _message;
@override
final int offset;
@override
final String? url;
/// Initialize a newly created message to represent a [message] reported in
/// the file at the given [filePath] at the given [offset] and with the given
/// [length].
DiagnosticMessageImpl({
required this.filePath,
required this.length,
required String message,
required this.offset,
required this.url,
}) : _message = message;
@override
String messageText({required bool includeUrl}) {
if (includeUrl && url != null) {
StringBuffer result = new StringBuffer(_message);
if (!_message.endsWith('.')) {
result.write('.');
}
result.write(' See $url');
return result.toString();
}
return _message;
}
}
/// An indication of the severity of a [Diagnostic].
@AnalyzerPublicApi(
message: 'exported by package:analyzer/diagnostic/diagnostic.dart',
)
enum Severity { error, warning, info }
pkg/_fe_analyzer_shared/lib/src/base/errors.dart
-403
View File
@@ -8,12 +8,7 @@ library;
import 'dart:math';
import 'package:_fe_analyzer_shared/src/base/analyzer_public_api.dart';
import 'package:_fe_analyzer_shared/src/base/diagnostic_message.dart';
import 'package:_fe_analyzer_shared/src/base/source.dart';
import 'package:_fe_analyzer_shared/src/base/source_range.dart';
import 'package:_fe_analyzer_shared/src/base/syntactic_entity.dart';
import 'package:_fe_analyzer_shared/src/scanner/characters.dart';
import 'package:source_span/source_span.dart';
import 'customized_codes.dart';
@@ -76,175 +71,6 @@ String formatList(String pattern, List<Object?>? arguments) {
return buffer.join();
}
/// A diagnostic, as defined by the [Diagnostic Design Guidelines][guidelines]:
///
/// > An indication of a specific problem at a specific location within the
/// > source code being processed by a development tool.
///
/// Clients may not extend, implement or mix-in this class.
///
/// [guidelines]: https://github.com/dart-lang/sdk/blob/main/pkg/analyzer/doc/implementation/diagnostics.md
@AnalyzerPublicApi(
message: 'Exported by package:analyzer/diagnostic/diagnostic.dart',
)
class Diagnostic {
/// The diagnostic code associated with the diagnostic.
final DiagnosticCode diagnosticCode;
/// A list of messages that provide context for understanding the problem
/// being reported. The list will be empty if there are no such messages.
final List<DiagnosticMessage> contextMessages;
/// A description of how to fix the problem, or `null` if there is no such
/// description.
final String? correctionMessage;
/// A message describing what is wrong and why.
final DiagnosticMessage problemMessage;
/// The source in which the diagnostic occurred, or `null` if unknown.
final Source source;
Diagnostic.forValues({
required this.source,
required int offset,
required int length,
required this.diagnosticCode,
required String message,
this.correctionMessage,
this.contextMessages = const [],
}) : problemMessage = new DiagnosticMessageImpl(
filePath: source.fullName,
length: length,
message: message,
offset: offset,
url: null,
);
/// Initialize a newly created diagnostic.
///
/// The diagnostic is associated with the given [source] and is located at the
/// given [offset] with the given [length]. The diagnostic will have the given
/// [diagnosticCode] and the list of [arguments] will be used to complete the
/// message and correction. If any [contextMessages] are provided, they will
/// be recorded with the diagnostic.
factory Diagnostic.tmp({
required Source source,
required int offset,
required int length,
required DiagnosticCode diagnosticCode,
List<Object?> arguments = const [],
List<DiagnosticMessage> contextMessages = const [],
}) {
assert(
arguments.length == diagnosticCode.numParameters,
'Message $diagnosticCode requires ${diagnosticCode.numParameters} '
'argument${diagnosticCode.numParameters == 1 ? '' : 's'}, but '
'${arguments.length} '
'argument${arguments.length == 1 ? ' was' : 's were'} '
'provided',
);
String message = formatList(diagnosticCode.problemMessage, arguments);
String? correctionTemplate = diagnosticCode.correctionMessage;
String? correctionMessage;
if (correctionTemplate != null) {
correctionMessage = formatList(correctionTemplate, arguments);
}
return new Diagnostic.forValues(
source: source,
offset: offset,
length: length,
diagnosticCode: diagnosticCode,
message: message,
correctionMessage: correctionMessage,
contextMessages: contextMessages,
);
}
/// The template used to create the correction to be displayed for this
/// diagnostic, or `null` if there is no correction information for this
/// error. The correction should indicate how the user can fix the error.
@Deprecated("Use 'correctionMessage' instead.")
String? get correction => correctionMessage;
@Deprecated("Use 'diagnosticCode' instead")
DiagnosticCode get errorCode => diagnosticCode;
@override
int get hashCode {
int hashCode = offset;
hashCode ^= message.hashCode;
hashCode ^= source.hashCode;
return hashCode;
}
/// The number of characters from the offset to the end of the source which
/// encompasses the compilation error.
int get length => problemMessage.length;
/// The message to be displayed for this diagnostic.
///
/// The message indicates what is wrong and why it is wrong.
String get message => problemMessage.messageText(includeUrl: true);
/// The character offset from the beginning of the source (zero based) where
/// the diagnostic occurred.
int get offset => problemMessage.offset;
Severity get severity {
switch (diagnosticCode.severity) {
case DiagnosticSeverity.ERROR:
return Severity.error;
case DiagnosticSeverity.WARNING:
return Severity.warning;
case DiagnosticSeverity.INFO:
return Severity.info;
default:
throw new StateError('Invalid severity: ${diagnosticCode.severity}');
}
}
@override
bool operator ==(Object other) {
if (identical(other, this)) {
return true;
}
// prepare the other Diagnostic.
if (other is Diagnostic) {
// Quick checks.
if (!identical(diagnosticCode, other.diagnosticCode)) {
return false;
}
if (offset != other.offset || length != other.length) {
return false;
}
// Deep checks.
if (message != other.message) {
return false;
}
if (source != other.source) {
return false;
}
return true;
}
return false;
}
@override
String toString() {
StringBuffer buffer = new StringBuffer();
buffer.write(source.fullName);
buffer.write("(");
buffer.write(offset);
buffer.write("..");
buffer.write(offset + length - 1);
buffer.write("): ");
buffer.write(message);
return buffer.toString();
}
}
/// An error code associated with an `AnalysisError`.
///
/// Generally, messages should follow the [Guide for Writing
@@ -376,23 +202,6 @@ abstract class DiagnosticCodeImpl extends DiagnosticCode {
DiagnosticSeverity get severity => type.severity;
}
/// Private subtype of [DiagnosticCode] that supports runtime checking of
/// parameter types.
class DiagnosticCodeWithExpectedTypes extends DiagnosticCodeImpl {
final List<ExpectedType>? expectedTypes;
const DiagnosticCodeWithExpectedTypes({
super.correctionMessage,
super.hasPublishedDocs = false,
super.isUnresolvedIdentifier = false,
required super.name,
required super.problemMessage,
required super.type,
required super.uniqueName,
this.expectedTypes,
});
}
/// The severity of an [DiagnosticCode].
@AnalyzerPublicApi(message: 'exported by package:analyzer/error/error.dart')
class DiagnosticSeverity implements Comparable<DiagnosticSeverity> {
@@ -565,215 +374,3 @@ class DiagnosticType implements Comparable<DiagnosticType> {
@override
String toString() => name;
}
/// Common functionality for [DiagnosticCode]-derived classes that represent
/// errors that take arguments.
///
/// This class provides a [withArguments] getter, which can be used to supply
/// arguments and produce a [LocatableDiagnostic].
///
/// Note: the type argument `T` should be instantiated with a function type. But
/// it is typed as `extends Object` in order to reduce the risk of accidental
/// dynamic invocation of [withArguments].
class DiagnosticWithArguments<T extends Object>
extends DiagnosticCodeWithExpectedTypes {
/// Function accepting named arguments and returning [LocatableDiagnostic].
///
/// The value returned by this function can
/// be associated with a location in the source code using the
/// [LocatableDiagnostic.at] method, and then the result can be passed to
/// [DiagnosticReporter.reportError].
final T withArguments;
const DiagnosticWithArguments({
required super.name,
required super.problemMessage,
super.correctionMessage,
super.hasPublishedDocs = false,
super.isUnresolvedIdentifier = false,
required super.type,
required super.uniqueName,
required super.expectedTypes,
required this.withArguments,
});
}
/// Common functionality for [DiagnosticCode]-derived classes that represent
/// errors that do not take arguments.
///
/// This class implements [LocatableDiagnostic], which means that instances can
/// be associated with a location in the source code using the [at] method, and
/// then the result can be passed to [DiagnosticReporter.reportError].
base mixin DiagnosticWithoutArguments on DiagnosticCodeImpl
implements LocatableDiagnostic {
@override
List<Object> get arguments => const [];
@override
DiagnosticCode get code => this;
@override
Iterable<DiagnosticMessage> get contextMessages => const [];
@override
LocatedDiagnostic at(SyntacticEntity node) =>
atOffset(offset: node.offset, length: node.length);
@override
LocatedDiagnostic atOffset({required int offset, required int length}) =>
new LocatedDiagnostic(this, offset, length);
@override
LocatedDiagnostic atSourceRange(SourceRange sourceRange) =>
atOffset(offset: sourceRange.offset, length: sourceRange.length);
@override
LocatedDiagnostic atSourceSpan(SourceSpan span) =>
atOffset(offset: span.start.offset, length: span.length);
@override
LocatableDiagnostic withContextMessages(
Iterable<DiagnosticMessage> messages,
) => new LocatableDiagnosticImpl(
code,
arguments,
contextMessages: [...messages],
);
}
/// Concrete implementation of [DiagnosticWithoutArguments], used for diagnostic
/// messages that don't take any arguments.
///
/// This needs to be a separate class from [DiagnosticWithoutArguments] because
/// [DiagnosticWithoutArguments] is a mixin.
final class DiagnosticWithoutArgumentsImpl
extends DiagnosticCodeWithExpectedTypes
with DiagnosticWithoutArguments {
const DiagnosticWithoutArgumentsImpl({
required super.name,
required super.problemMessage,
super.correctionMessage,
super.hasPublishedDocs = false,
super.isUnresolvedIdentifier = false,
required super.type,
required super.uniqueName,
super.expectedTypes,
});
}
/// Expected type of a diagnostic code's parameter.
enum ExpectedType { element, int, name, object, string, token, type, uri }
/// Interface for a diagnostic that does not have any unfilled template
/// parameters, and hence is ready to be associated with a location in the
/// source code.
///
/// This could either be the result of calling `withArguments` on a diagnostic
/// code that requires arguments, or it could be a diagnostic code that doesn't
/// require arguments.
abstract final class LocatableDiagnostic {
/// The arguments that were applied to the diagnostic, or the empty list if
/// [code] doesn't accept any arguments.
List<Object> get arguments;
/// The [DiagnosticCode] associated with the diagnostic.
DiagnosticCode get code;
/// The context messages that were applied to the diagnostic.
Iterable<DiagnosticMessage> get contextMessages;
/// Converts this diagnostic to a [LocatedDiagnostic] by applying it to a
/// syntactic entity in the source code.
///
/// The result may be passed to [DiagnosticReporter.reportError].
LocatedDiagnostic at(SyntacticEntity node);
/// Converts this diagnostic to a [LocatedDiagnostic] by applying it to a
/// location in the source code.
///
/// The result may be passed to [DiagnosticReporter.reportError].
LocatedDiagnostic atOffset({required int offset, required int length});
/// Converts this diagnostic to a [LocatedDiagnostic] by applying it to a
/// location in the source code.
///
/// The result may be passed to [DiagnosticReporter.reportError].
LocatedDiagnostic atSourceRange(SourceRange sourceRange);
/// Converts this diagnostic to a [LocatedDiagnostic] by applying it to a
/// location in the source code.
///
/// The result may be passed to [DiagnosticReporter.reportError].
LocatedDiagnostic atSourceSpan(SourceSpan span);
/// Attaches context messages to this diagnostic.
///
/// The return value is a fresh instance of [LocatableDiagnostic]. This allows
/// for a literate style of error reporting, e.g.:
/// ```dart
/// // For an diagnostic code that doesn't take arguments:
/// diagnosticReporter.reportError(
/// diagnosticCode.withContextMessages(messages).at(astNode));
///
/// // For a diagnostic code that does take arguments:
/// diagnosticReporter.reportError(
/// diagnosticCode
/// .withArguments(...)
/// .withContextMessages(messages)
/// .at(astNode));
/// ```
LocatableDiagnostic withContextMessages(Iterable<DiagnosticMessage> messages);
}
/// Concrete implementation of [LocatableDiagnostic].
final class LocatableDiagnosticImpl implements LocatableDiagnostic {
@override
final DiagnosticCode code;
@override
final List<Object> arguments;
@override
final Iterable<DiagnosticMessage> contextMessages;
LocatableDiagnosticImpl(
this.code,
this.arguments, {
this.contextMessages = const [],
});
@override
LocatedDiagnostic at(SyntacticEntity node) =>
atOffset(offset: node.offset, length: node.length);
@override
LocatedDiagnostic atOffset({required int offset, required int length}) =>
new LocatedDiagnostic(this, offset, length);
@override
LocatedDiagnostic atSourceRange(SourceRange sourceRange) =>
atOffset(offset: sourceRange.offset, length: sourceRange.length);
@override
LocatedDiagnostic atSourceSpan(SourceSpan span) =>
atOffset(offset: span.start.offset, length: span.length);
@override
LocatableDiagnostic withContextMessages(
Iterable<DiagnosticMessage> messages,
) => new LocatableDiagnosticImpl(
code,
arguments,
contextMessages: [...contextMessages, ...messages],
);
}
/// A diagnostic that does not have any unfilled template parameters, and has
/// been associated with a location in the source code.
final class LocatedDiagnostic {
final LocatableDiagnostic locatableDiagnostic;
final int offset;
final int length;
LocatedDiagnostic(this.locatableDiagnostic, this.offset, this.length);
}
pkg/_fe_analyzer_shared/pubspec.yaml
-1
View File
@@ -12,7 +12,6 @@ resolution: workspace
dependencies:
meta: ^1.9.0
source_span: ^1.10.0
# We use 'any' version constraints here as we get our package versions from
# the dart-lang/sdk repo's DEPS file. Note that this is a special case; the
pkg/analysis_server/lib/src/diagnostic.dart
+1
View File
@@ -3,6 +3,7 @@
// BSD-style license that can be found in the LICENSE file.
import 'package:_fe_analyzer_shared/src/base/errors.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart';
import 'diagnostic.dart' as diag;
pkg/analysis_server_plugin/api.txt
+2 -1
View File
@@ -161,7 +161,6 @@ dart:core:
bool (referenced)
int (referenced)
package:_fe_analyzer_shared/src/base/errors.dart:
Diagnostic (referenced)
DiagnosticCode (referenced)
package:_fe_analyzer_shared/src/base/source_range.dart:
SourceRange (referenced)
@@ -193,6 +192,8 @@ package:analyzer/dart/element/type_provider.dart:
TypeProvider (referenced)
package:analyzer/dart/element/type_system.dart:
TypeSystem (referenced)
package:analyzer/diagnostic/diagnostic.dart:
Diagnostic (referenced)
package:analyzer/instrumentation/service.dart:
InstrumentationService (referenced)
package:analyzer/src/dart/ast/ast.dart:
pkg/analyzer/lib/diagnostic/diagnostic.dart
+175 -3
View File
@@ -2,6 +2,178 @@
// 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.
export 'package:_fe_analyzer_shared/src/base/diagnostic_message.dart'
show DiagnosticMessage, Severity;
export 'package:_fe_analyzer_shared/src/base/errors.dart' show Diagnostic;
import 'package:_fe_analyzer_shared/src/base/errors.dart';
import 'package:analyzer/source/source.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart'
show DiagnosticMessage, DiagnosticMessageImpl;
export 'package:analyzer/src/diagnostic/diagnostic.dart' show DiagnosticMessage;
/// A diagnostic, as defined by the [Diagnostic Design Guidelines][guidelines]:
///
/// > An indication of a specific problem at a specific location within the
/// > source code being processed by a development tool.
///
/// Clients may not extend, implement or mix-in this class.
///
/// [guidelines]: https://github.com/dart-lang/sdk/blob/main/pkg/analyzer/doc/implementation/diagnostics.md
class Diagnostic {
/// The diagnostic code associated with the diagnostic.
final DiagnosticCode diagnosticCode;
/// A list of messages that provide context for understanding the problem
/// being reported. The list will be empty if there are no such messages.
final List<DiagnosticMessage> contextMessages;
/// A description of how to fix the problem, or `null` if there is no such
/// description.
final String? correctionMessage;
/// A message describing what is wrong and why.
final DiagnosticMessage problemMessage;
/// The source in which the diagnostic occurred, or `null` if unknown.
final Source source;
Diagnostic.forValues({
required this.source,
required int offset,
required int length,
required this.diagnosticCode,
required String message,
this.correctionMessage,
this.contextMessages = const [],
}) : problemMessage = DiagnosticMessageImpl(
filePath: source.fullName,
length: length,
message: message,
offset: offset,
url: null,
);
/// Initialize a newly created diagnostic.
///
/// The diagnostic is associated with the given [source] and is located at the
/// given [offset] with the given [length]. The diagnostic will have the given
/// [diagnosticCode] and the list of [arguments] will be used to complete the
/// message and correction. If any [contextMessages] are provided, they will
/// be recorded with the diagnostic.
factory Diagnostic.tmp({
required Source source,
required int offset,
required int length,
required DiagnosticCode diagnosticCode,
List<Object?> arguments = const [],
List<DiagnosticMessage> contextMessages = const [],
}) {
assert(
arguments.length == diagnosticCode.numParameters,
'Message $diagnosticCode requires ${diagnosticCode.numParameters} '
'argument${diagnosticCode.numParameters == 1 ? '' : 's'}, but '
'${arguments.length} '
'argument${arguments.length == 1 ? ' was' : 's were'} '
'provided',
);
String message = formatList(diagnosticCode.problemMessage, arguments);
String? correctionTemplate = diagnosticCode.correctionMessage;
String? correctionMessage;
if (correctionTemplate != null) {
correctionMessage = formatList(correctionTemplate, arguments);
}
return Diagnostic.forValues(
source: source,
offset: offset,
length: length,
diagnosticCode: diagnosticCode,
message: message,
correctionMessage: correctionMessage,
contextMessages: contextMessages,
);
}
/// The template used to create the correction to be displayed for this
/// diagnostic, or `null` if there is no correction information for this
/// error. The correction should indicate how the user can fix the error.
@Deprecated("Use 'correctionMessage' instead.")
String? get correction => correctionMessage;
@Deprecated("Use 'diagnosticCode' instead")
DiagnosticCode get errorCode => diagnosticCode;
@override
int get hashCode {
int hashCode = offset;
hashCode ^= message.hashCode;
hashCode ^= source.hashCode;
return hashCode;
}
/// The number of characters from the offset to the end of the source which
/// encompasses the compilation error.
int get length => problemMessage.length;
/// The message to be displayed for this diagnostic.
///
/// The message indicates what is wrong and why it is wrong.
String get message => problemMessage.messageText(includeUrl: true);
/// The character offset from the beginning of the source (zero based) where
/// the diagnostic occurred.
int get offset => problemMessage.offset;
Severity get severity {
switch (diagnosticCode.severity) {
case DiagnosticSeverity.ERROR:
return Severity.error;
case DiagnosticSeverity.WARNING:
return Severity.warning;
case DiagnosticSeverity.INFO:
return Severity.info;
default:
throw StateError('Invalid severity: ${diagnosticCode.severity}');
}
}
@override
bool operator ==(Object other) {
if (identical(other, this)) {
return true;
}
// prepare the other Diagnostic.
if (other is Diagnostic) {
// Quick checks.
if (!identical(diagnosticCode, other.diagnosticCode)) {
return false;
}
if (offset != other.offset || length != other.length) {
return false;
}
// Deep checks.
if (message != other.message) {
return false;
}
if (source != other.source) {
return false;
}
return true;
}
return false;
}
@override
String toString() {
StringBuffer buffer = StringBuffer();
buffer.write(source.fullName);
buffer.write("(");
buffer.write(offset);
buffer.write("..");
buffer.write(offset + length - 1);
buffer.write("): ");
buffer.write(message);
return buffer.toString();
}
}
/// An indication of the severity of a [Diagnostic].
enum Severity { error, warning, info }
pkg/analyzer/lib/error/error.dart
+1
View File
@@ -8,6 +8,7 @@ library;
import 'dart:collection';
import 'package:_fe_analyzer_shared/src/base/errors.dart';
import 'package:analyzer/diagnostic/diagnostic.dart';
import 'package:analyzer/src/diagnostic/diagnostic_code_values.dart';
export 'package:_fe_analyzer_shared/src/base/errors.dart'
pkg/analyzer/lib/error/listener.dart
-1
View File
@@ -2,7 +2,6 @@
// 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:_fe_analyzer_shared/src/base/errors.dart';
import 'package:analyzer/diagnostic/diagnostic.dart';
import 'package:analyzer/src/error/listener.dart';
pkg/analyzer/lib/src/dart/analysis/driver.dart
+2 -1
View File
@@ -39,7 +39,8 @@ import 'package:analyzer/src/dart/ast/ast.dart';
import 'package:analyzer/src/dart/element/element.dart';
import 'package:analyzer/src/dart/resolver/flow_analysis_visitor.dart';
import 'package:analyzer/src/dartdoc/dartdoc_directive_info.dart';
import 'package:analyzer/src/diagnostic/diagnostic_message.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart'
show DiagnosticMessageImpl;
import 'package:analyzer/src/exception/exception.dart';
import 'package:analyzer/src/fine/manifest_id.dart';
import 'package:analyzer/src/fine/requirements.dart';
pkg/analyzer/lib/src/dart/constant/evaluation.dart
+2 -1
View File
@@ -28,8 +28,9 @@ import 'package:analyzer/src/dart/element/type_algebra.dart';
import 'package:analyzer/src/dart/element/type_provider.dart';
import 'package:analyzer/src/dart/element/type_system.dart' show TypeSystemImpl;
import 'package:analyzer/src/dart/type_instantiation_target.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart'
show DiagnosticMessageImpl;
import 'package:analyzer/src/diagnostic/diagnostic.dart' as diag;
import 'package:analyzer/src/diagnostic/diagnostic_message.dart';
import 'package:analyzer/src/error/listener.dart';
import 'package:analyzer/src/generated/engine.dart';
import 'package:analyzer/src/generated/java_core.dart';
pkg/analyzer/lib/src/dart/element/extensions.dart
+2 -1
View File
@@ -10,7 +10,8 @@ import 'package:analyzer/source/source.dart';
import 'package:analyzer/source/source_range.dart';
import 'package:analyzer/src/dart/element/element.dart';
import 'package:analyzer/src/dart/element/type.dart';
import 'package:analyzer/src/diagnostic/diagnostic_message.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart'
show DiagnosticMessageImpl;
import 'package:analyzer/src/generated/utilities_dart.dart';
import 'package:meta/meta_meta.dart';
pkg/analyzer/lib/src/dart/error/lint_codes.dart
+2 -1
View File
@@ -8,8 +8,9 @@ library;
import 'package:_fe_analyzer_shared/src/base/analyzer_public_api.dart';
import 'package:_fe_analyzer_shared/src/base/errors.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart';
export 'package:_fe_analyzer_shared/src/base/errors.dart'
export 'package:analyzer/src/diagnostic/diagnostic.dart'
show
DiagnosticWithArguments,
DiagnosticWithoutArguments,
pkg/analyzer/lib/src/dart/error/todo_codes.dart
+2 -2
View File
@@ -6,8 +6,8 @@ import 'package:_fe_analyzer_shared/src/base/errors.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart' as diag;
typedef TodoDiagnosticCode =
DiagnosticWithArguments<
LocatableDiagnostic Function({required String message})
diag.DiagnosticWithArguments<
diag.LocatableDiagnostic Function({required String message})
>;
/// Static helper methods and properties for working with [DiagnosticType.TODO]
pkg/analyzer/lib/src/dart/resolver/named_type_resolver.dart
+2 -2
View File
@@ -14,13 +14,13 @@ import 'package:analyzer/src/dart/element/element.dart';
import 'package:analyzer/src/dart/element/type.dart';
import 'package:analyzer/src/dart/element/type_constraint_gatherer.dart';
import 'package:analyzer/src/dart/element/type_system.dart';
import 'package:analyzer/src/dart/error/lint_codes.dart';
import 'package:analyzer/src/dart/resolver/flow_analysis_visitor.dart';
import 'package:analyzer/src/dart/resolver/scope_context.dart';
import 'package:analyzer/src/dart/type_instantiation_target.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart'
show DiagnosticMessageImpl, LocatableDiagnostic;
import 'package:analyzer/src/diagnostic/diagnostic.dart' as diag;
import 'package:analyzer/src/diagnostic/diagnostic_factory.dart';
import 'package:analyzer/src/diagnostic/diagnostic_message.dart';
import 'package:analyzer/src/error/listener.dart';
import 'package:analyzer/src/generated/scope_helpers.dart';
pkg/analyzer/lib/src/dart/scanner/scanner.dart
+1 -2
View File
@@ -4,7 +4,6 @@
import 'dart:typed_data';
import 'package:_fe_analyzer_shared/src/base/errors.dart';
import 'package:_fe_analyzer_shared/src/parser/experimental_features.dart';
import 'package:_fe_analyzer_shared/src/scanner/scanner.dart' as fasta;
import 'package:_fe_analyzer_shared/src/scanner/token.dart' show Token;
@@ -34,7 +33,7 @@ class Scanner {
final String _inputText;
/// The callback to report diagnostics.
final void Function(LocatedDiagnostic) reportError;
final void Function(diag.LocatedDiagnostic) reportError;
/// If the file has [fasta.LanguageVersionToken], it is allowed to use the
/// language version greater than the one specified in the package config.
pkg/analyzer/lib/src/dart/scanner/translate_error_token.dart
+2 -3
View File
@@ -2,7 +2,6 @@
// 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:_fe_analyzer_shared/src/base/errors.dart';
import 'package:_fe_analyzer_shared/src/messages/codes.dart';
import 'package:_fe_analyzer_shared/src/messages/diagnostic.dart' as fe_diag;
import 'package:_fe_analyzer_shared/src/messages/diagnostic.dart';
@@ -18,7 +17,7 @@ void translateErrorToken(ErrorToken token, ReportError reportError) {
int charOffset = token.charOffset;
// TODO(paulberry): why is endOffset sometimes null?
int endOffset = token.endOffset ?? charOffset;
void makeError(LocatableDiagnostic locatableDiagnostic) {
void makeError(diag.LocatableDiagnostic locatableDiagnostic) {
if (_isAtEnd(token, charOffset)) {
// Analyzer never generates an error message past the end of the input,
// since such an error would not be visible in an editor.
@@ -129,4 +128,4 @@ bool _isAtEnd(Token token, int charOffset) {
/// Used to report a scan error.
/// The [locatedDiagnostic] contains the error code, arguments, and the location
/// of the error.
typedef ReportError = void Function(LocatedDiagnostic locatedDiagnostic);
typedef ReportError = void Function(diag.LocatedDiagnostic locatedDiagnostic);
pkg/analyzer/lib/src/dart/type_instantiation_target.dart
+6 -7
View File
@@ -6,7 +6,6 @@
// currently contains some classes called `TypeInstantiationTarget...` and some
// called `InvocationTarget...`.
import 'package:_fe_analyzer_shared/src/base/errors.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/src/dart/element/element.dart';
@@ -30,7 +29,7 @@ class InvocationTargetConstructorElement
InvocationTargetConstructorElement(super.element, this.rawType);
@override
LocatableDiagnostic wrongNumberOfTypeArgumentsError({
diag.LocatableDiagnostic wrongNumberOfTypeArgumentsError({
required int typeParameterCount,
required int typeArgumentCount,
}) {
@@ -68,7 +67,7 @@ class InvocationTargetExecutableElement extends TypeInstantiationTargetElement
element.type as FunctionTypeImpl;
@override
LocatableDiagnostic wrongNumberOfTypeArgumentsError({
diag.LocatableDiagnostic wrongNumberOfTypeArgumentsError({
required int typeParameterCount,
required int typeArgumentCount,
}) {
@@ -102,7 +101,7 @@ class InvocationTargetExtensionOverride extends InvocationTarget {
FunctionTypeImpl get rawType => type;
@override
LocatableDiagnostic wrongNumberOfTypeArgumentsError({
diag.LocatableDiagnostic wrongNumberOfTypeArgumentsError({
required int typeParameterCount,
required int typeArgumentCount,
}) {
@@ -132,7 +131,7 @@ class InvocationTargetFunctionTypedExpression extends InvocationTarget {
FunctionTypeImpl get rawType => type;
@override
LocatableDiagnostic wrongNumberOfTypeArgumentsError({
diag.LocatableDiagnostic wrongNumberOfTypeArgumentsError({
required int typeParameterCount,
required int typeArgumentCount,
}) {
@@ -160,7 +159,7 @@ sealed class TypeInstantiationTarget {
/// Creates the appropriate diagnostic message when the wrong number of type
/// arguments is applied.
LocatableDiagnostic wrongNumberOfTypeArgumentsError({
diag.LocatableDiagnostic wrongNumberOfTypeArgumentsError({
required int typeParameterCount,
required int typeArgumentCount,
});
@@ -215,7 +214,7 @@ sealed class TypeInstantiationTargetTypeDefiningElement
const TypeInstantiationTargetTypeDefiningElement();
@override
LocatableDiagnostic wrongNumberOfTypeArgumentsError({
diag.LocatableDiagnostic wrongNumberOfTypeArgumentsError({
required int typeParameterCount,
required int typeArgumentCount,
}) {
pkg/analyzer/lib/src/diagnostic/diagnostic.dart
+309 -1
View File
@@ -2,12 +2,320 @@
// 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.
/// @docImport 'package:analyzer/src/error/inference_error.dart';
/// @docImport 'package:analyzer/diagnostic/diagnostic.dart';
/// @docImport 'package:analyzer/error/listener.dart';
library;
import 'package:_fe_analyzer_shared/src/base/analyzer_public_api.dart';
import 'package:_fe_analyzer_shared/src/base/errors.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/source/source_range.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart' as diag;
import 'package:source_span/source_span.dart';
part 'package:analyzer/src/diagnostic/diagnostic.g.dart';
/// Private subtype of [DiagnosticCode] that supports runtime checking of
/// parameter types.
class DiagnosticCodeWithExpectedTypes extends DiagnosticCodeImpl {
final List<ExpectedType>? expectedTypes;
const DiagnosticCodeWithExpectedTypes({
super.correctionMessage,
super.hasPublishedDocs = false,
super.isUnresolvedIdentifier = false,
required super.name,
required super.problemMessage,
required super.type,
required super.uniqueName,
this.expectedTypes,
});
}
/// A single message associated with a [Diagnostic], consisting of the text of
/// the message and the location associated with it.
///
/// Clients may not extend, implement or mix-in this class.
@AnalyzerPublicApi(
message: 'Exported by package:analyzer/diagnostic/diagnostic.dart',
)
abstract class DiagnosticMessage {
/// The absolute and normalized path of the file associated with this message.
String get filePath;
/// The length of the source range associated with this message.
int get length;
/// The zero-based offset from the start of the file to the beginning of the
/// source range associated with this message.
int get offset;
/// The URL containing documentation about this diagnostic message, if any.
///
/// Note: this should not be confused with the location in the user's code
/// where the error was reported; that information can be obtained from
/// [filePath], [length], and [offset].
String? get url;
/// Gets the text of the message.
///
/// If [includeUrl] is `true`, and this diagnostic message has an associated
/// URL, it is included in the returned value in a human-readable way.
/// Clients that wish to present URLs as simple text can do this. If
/// [includeUrl] is `false`, no URL is included in the returned value.
/// Clients that have a special mechanism for presenting URLs (e.g. as a
/// clickable link) should do this and then consult the [url] getter to access
/// the URL.
String messageText({required bool includeUrl});
}
/// A concrete implementation of a diagnostic message.
class DiagnosticMessageImpl implements DiagnosticMessage {
@override
final String filePath;
@override
final int length;
final String _message;
@override
final int offset;
@override
final String? url;
/// Initialize a newly created message to represent a [message] reported in
/// the file at the given [filePath] at the given [offset] and with the given
/// [length].
DiagnosticMessageImpl({
required this.filePath,
required this.length,
required String message,
required this.offset,
required this.url,
}) : _message = message;
@override
String messageText({required bool includeUrl}) {
if (includeUrl && url != null) {
var result = StringBuffer(_message);
if (!_message.endsWith('.')) {
result.write('.');
}
result.write(' See $url');
return result.toString();
}
return _message;
}
}
/// Common functionality for [DiagnosticCode]-derived classes that represent
/// errors that take arguments.
///
/// This class provides a [withArguments] getter, which can be used to supply
/// arguments and produce a [LocatableDiagnostic].
///
/// Note: the type argument `T` should be instantiated with a function type. But
/// it is typed as `extends Object` in order to reduce the risk of accidental
/// dynamic invocation of [withArguments].
class DiagnosticWithArguments<T extends Object>
extends DiagnosticCodeWithExpectedTypes {
/// Function accepting named arguments and returning [LocatableDiagnostic].
///
/// The value returned by this function can
/// be associated with a location in the source code using the
/// [LocatableDiagnostic.at] method, and then the result can be passed to
/// [DiagnosticReporter.reportError].
final T withArguments;
const DiagnosticWithArguments({
required super.name,
required super.problemMessage,
super.correctionMessage,
super.hasPublishedDocs = false,
super.isUnresolvedIdentifier = false,
required super.type,
required super.uniqueName,
required super.expectedTypes,
required this.withArguments,
});
}
/// Common functionality for [DiagnosticCode]-derived classes that represent
/// errors that do not take arguments.
///
/// This class implements [LocatableDiagnostic], which means that instances can
/// be associated with a location in the source code using the [at] method, and
/// then the result can be passed to [DiagnosticReporter.reportError].
base mixin DiagnosticWithoutArguments on DiagnosticCodeImpl
implements LocatableDiagnostic {
@override
List<Object> get arguments => const [];
@override
DiagnosticCode get code => this;
@override
Iterable<DiagnosticMessage> get contextMessages => const [];
@override
LocatedDiagnostic at(SyntacticEntity node) =>
atOffset(offset: node.offset, length: node.length);
@override
LocatedDiagnostic atOffset({required int offset, required int length}) =>
LocatedDiagnostic(this, offset, length);
@override
LocatedDiagnostic atSourceRange(SourceRange sourceRange) =>
atOffset(offset: sourceRange.offset, length: sourceRange.length);
@override
LocatedDiagnostic atSourceSpan(SourceSpan span) =>
atOffset(offset: span.start.offset, length: span.length);
@override
LocatableDiagnostic withContextMessages(
Iterable<DiagnosticMessage> messages,
) => LocatableDiagnosticImpl(code, arguments, contextMessages: [...messages]);
}
/// Concrete implementation of [DiagnosticWithoutArguments], used for diagnostic
/// messages that don't take any arguments.
///
/// This needs to be a separate class from [DiagnosticWithoutArguments] because
/// [DiagnosticWithoutArguments] is a mixin.
final class DiagnosticWithoutArgumentsImpl
extends DiagnosticCodeWithExpectedTypes
with DiagnosticWithoutArguments {
const DiagnosticWithoutArgumentsImpl({
required super.name,
required super.problemMessage,
super.correctionMessage,
super.hasPublishedDocs = false,
super.isUnresolvedIdentifier = false,
required super.type,
required super.uniqueName,
super.expectedTypes,
});
}
/// Expected type of a diagnostic code's parameter.
enum ExpectedType { element, int, name, object, string, token, type, uri }
/// Interface for a diagnostic that does not have any unfilled template
/// parameters, and hence is ready to be associated with a location in the
/// source code.
///
/// This could either be the result of calling `withArguments` on a diagnostic
/// code that requires arguments, or it could be a diagnostic code that doesn't
/// require arguments.
abstract final class LocatableDiagnostic {
/// The arguments that were applied to the diagnostic, or the empty list if
/// [code] doesn't accept any arguments.
List<Object> get arguments;
/// The [DiagnosticCode] associated with the diagnostic.
DiagnosticCode get code;
/// The context messages that were applied to the diagnostic.
Iterable<DiagnosticMessage> get contextMessages;
/// Converts this diagnostic to a [LocatedDiagnostic] by applying it to a
/// syntactic entity in the source code.
///
/// The result may be passed to [DiagnosticReporter.reportError].
LocatedDiagnostic at(SyntacticEntity node);
/// Converts this diagnostic to a [LocatedDiagnostic] by applying it to a
/// location in the source code.
///
/// The result may be passed to [DiagnosticReporter.reportError].
LocatedDiagnostic atOffset({required int offset, required int length});
/// Converts this diagnostic to a [LocatedDiagnostic] by applying it to a
/// location in the source code.
///
/// The result may be passed to [DiagnosticReporter.reportError].
LocatedDiagnostic atSourceRange(SourceRange sourceRange);
/// Converts this diagnostic to a [LocatedDiagnostic] by applying it to a
/// location in the source code.
///
/// The result may be passed to [DiagnosticReporter.reportError].
LocatedDiagnostic atSourceSpan(SourceSpan span);
/// Attaches context messages to this diagnostic.
///
/// The return value is a fresh instance of [LocatableDiagnostic]. This allows
/// for a literate style of error reporting, e.g.:
/// ```dart
/// // For an diagnostic code that doesn't take arguments:
/// diagnosticReporter.reportError(
/// diagnosticCode.withContextMessages(messages).at(astNode));
///
/// // For a diagnostic code that does take arguments:
/// diagnosticReporter.reportError(
/// diagnosticCode
/// .withArguments(...)
/// .withContextMessages(messages)
/// .at(astNode));
/// ```
LocatableDiagnostic withContextMessages(Iterable<DiagnosticMessage> messages);
}
/// Concrete implementation of [LocatableDiagnostic].
final class LocatableDiagnosticImpl implements LocatableDiagnostic {
@override
final DiagnosticCode code;
@override
final List<Object> arguments;
@override
final Iterable<DiagnosticMessage> contextMessages;
LocatableDiagnosticImpl(
this.code,
this.arguments, {
this.contextMessages = const [],
});
@override
LocatedDiagnostic at(SyntacticEntity node) =>
atOffset(offset: node.offset, length: node.length);
@override
LocatedDiagnostic atOffset({required int offset, required int length}) =>
LocatedDiagnostic(this, offset, length);
@override
LocatedDiagnostic atSourceRange(SourceRange sourceRange) =>
atOffset(offset: sourceRange.offset, length: sourceRange.length);
@override
LocatedDiagnostic atSourceSpan(SourceSpan span) =>
atOffset(offset: span.start.offset, length: span.length);
@override
LocatableDiagnostic withContextMessages(
Iterable<DiagnosticMessage> messages,
) => LocatableDiagnosticImpl(
code,
arguments,
contextMessages: [...contextMessages, ...messages],
);
}
/// A diagnostic that does not have any unfilled template parameters, and has
/// been associated with a location in the source code.
final class LocatedDiagnostic {
final LocatableDiagnostic locatableDiagnostic;
final int offset;
final int length;
LocatedDiagnostic(this.locatableDiagnostic, this.offset, this.length);
}
pkg/analyzer/lib/src/diagnostic/diagnostic_factory.dart
+21 -21
View File
@@ -2,7 +2,6 @@
// 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:_fe_analyzer_shared/src/base/errors.dart';
import 'package:analyzer/dart/ast/syntactic_entity.dart';
import 'package:analyzer/dart/ast/token.dart';
import 'package:analyzer/dart/element/element.dart';
@@ -10,14 +9,15 @@ import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/source/source.dart';
import 'package:analyzer/src/dart/ast/ast.dart';
import 'package:analyzer/src/dart/element/element.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart'
show DiagnosticMessageImpl;
import 'package:analyzer/src/diagnostic/diagnostic.dart' as diag;
import 'package:analyzer/src/diagnostic/diagnostic_message.dart';
import 'package:analyzer/src/utilities/extensions/string.dart';
import 'package:yaml/yaml.dart';
typedef InvalidOverrideDiagnosticCode =
DiagnosticWithArguments<
LocatableDiagnostic Function({
diag.DiagnosticWithArguments<
diag.LocatableDiagnostic Function({
required String memberName,
required String declaringInterfaceName,
required DartType typeInDeclaringInterface,
@@ -33,7 +33,7 @@ class DiagnosticFactory {
/// Return a diagnostic indicating that [duplicate] uses the same [variable]
/// as a previous [original] node in a pattern assignment.
LocatedDiagnostic duplicateAssignmentPatternVariable({
diag.LocatedDiagnostic duplicateAssignmentPatternVariable({
required Source source,
required PromotableElementImpl variable,
required AssignedVariablePatternImpl original,
@@ -55,8 +55,8 @@ class DiagnosticFactory {
/// Return a diagnostic indicating that [duplicateFragment] reuses a name
/// already used by [originalElement].
LocatedDiagnostic duplicateDefinition(
LocatableDiagnostic locatableDiagnostic,
diag.LocatedDiagnostic duplicateDefinition(
diag.LocatableDiagnostic locatableDiagnostic,
FragmentImpl duplicateFragment,
ElementImpl originalElement,
) {
@@ -81,9 +81,9 @@ class DiagnosticFactory {
/// Return a diagnostic indicating that [duplicateNode] reuses a name
/// already used by [originalNode].
LocatedDiagnostic duplicateDefinitionForNodes(
diag.LocatedDiagnostic duplicateDefinitionForNodes(
Source source,
LocatableDiagnostic locatableDiagnostic,
diag.LocatableDiagnostic locatableDiagnostic,
SyntacticEntity duplicateNode,
SyntacticEntity originalNode,
) {
@@ -102,7 +102,7 @@ class DiagnosticFactory {
/// Return a diagnostic indicating that [duplicateField] reuses a name
/// already used by [originalField].
LocatedDiagnostic duplicateFieldDefinitionInLiteral(
diag.LocatedDiagnostic duplicateFieldDefinitionInLiteral(
Source source,
RecordLiteralNamedField duplicateField,
RecordLiteralNamedField originalField,
@@ -128,7 +128,7 @@ class DiagnosticFactory {
///
/// This method requires that both the [duplicateField] and [originalField]
/// have a non-null `name`.
LocatedDiagnostic duplicateFieldDefinitionInType(
diag.LocatedDiagnostic duplicateFieldDefinitionInType(
Source source,
RecordTypeAnnotationField duplicateField,
RecordTypeAnnotationField originalField,
@@ -151,7 +151,7 @@ class DiagnosticFactory {
/// Return a diagnostic indicating that [duplicateField] reuses a name
/// already used by [originalField].
LocatedDiagnostic duplicatePatternField({
diag.LocatedDiagnostic duplicatePatternField({
required Source source,
required String name,
required PatternField duplicateField,
@@ -177,7 +177,7 @@ class DiagnosticFactory {
/// Return a diagnostic indicating that [duplicateElement] reuses a name
/// already used by [originalElement].
LocatedDiagnostic duplicateRestElementInPattern({
diag.LocatedDiagnostic duplicateRestElementInPattern({
required Source source,
required RestPatternElement originalElement,
required RestPatternElement duplicateElement,
@@ -197,7 +197,7 @@ class DiagnosticFactory {
/// Return a diagnostic indicating that the [duplicateElement] (in a constant
/// set) is a duplicate of the [originalElement].
LocatedDiagnostic equalElementsInConstSet(
diag.LocatedDiagnostic equalElementsInConstSet(
Source source,
Expression duplicateElement,
Expression originalElement,
@@ -217,7 +217,7 @@ class DiagnosticFactory {
/// Return a diagnostic indicating that the [duplicateKey] (in a constant map)
/// is a duplicate of the [originalKey].
LocatedDiagnostic equalKeysInConstMap(
diag.LocatedDiagnostic equalKeysInConstMap(
Source source,
Expression duplicateKey,
Expression originalKey,
@@ -237,7 +237,7 @@ class DiagnosticFactory {
/// Return a diagnostic indicating that the [duplicateKey] (in a map pattern)
/// is a duplicate of the [originalKey].
LocatedDiagnostic equalKeysInMapPattern(
diag.LocatedDiagnostic equalKeysInMapPattern(
Source source,
Expression duplicateKey,
Expression originalKey,
@@ -255,7 +255,7 @@ class DiagnosticFactory {
.at(duplicateKey);
}
LocatedDiagnostic incompatibleLint({
diag.LocatedDiagnostic incompatibleLint({
required Source source,
required YamlScalar reference,
required Map<String, YamlScalar> incompatibleRules,
@@ -286,7 +286,7 @@ class DiagnosticFactory {
/// Returns a diagnostic indicating that incompatible rules were found between
/// the current list and one or more of the included files.
LocatedDiagnostic incompatibleLintFiles({
diag.LocatedDiagnostic incompatibleLintFiles({
required Source source,
required YamlScalar reference,
required Map<String, YamlScalar> incompatibleRules,
@@ -318,7 +318,7 @@ class DiagnosticFactory {
/// Returns a diagnostic indicating that incompatible rules were found between
/// the included files.
LocatedDiagnostic incompatibleLintIncluded({
diag.LocatedDiagnostic incompatibleLintIncluded({
required Source source,
required YamlScalar reference,
required Map<String, YamlScalar> incompatibleRules,
@@ -353,7 +353,7 @@ class DiagnosticFactory {
/// Return a diagnostic indicating that [member] is not a correct override of
/// [superMember].
LocatedDiagnostic invalidOverride(
diag.LocatedDiagnostic invalidOverride(
Source source,
InvalidOverrideDiagnosticCode code,
SyntacticEntity errorNode,
@@ -403,7 +403,7 @@ class DiagnosticFactory {
/// Return a diagnostic indicating that the given [nameToken] was referenced
/// before it was declared.
LocatedDiagnostic referencedBeforeDeclaration(
diag.LocatedDiagnostic referencedBeforeDeclaration(
Source source, {
required Token nameToken,
required Element element2,
pkg/analyzer/lib/src/diagnostic/diagnostic_message.dart
-6
View File
@@ -1,6 +0,0 @@
// Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file
// 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.
export 'package:_fe_analyzer_shared/src/base/diagnostic_message.dart'
show DiagnosticMessageImpl;
pkg/analyzer/lib/src/error/base_or_final_type_verifier.dart
+2 -2
View File
@@ -6,12 +6,12 @@ import 'package:analyzer/dart/analysis/features.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/diagnostic/diagnostic.dart';
import 'package:analyzer/source/source.dart';
import 'package:analyzer/src/dart/element/element.dart';
import 'package:analyzer/src/dart/element/extensions.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart'
show DiagnosticMessage, DiagnosticMessageImpl;
import 'package:analyzer/src/diagnostic/diagnostic.dart' as diag;
import 'package:analyzer/src/diagnostic/diagnostic_message.dart';
import 'package:analyzer/src/error/listener.dart';
/// Helper for verifying that subelements of a base or final element must be
pkg/analyzer/lib/src/error/codes.dart
-2
View File
@@ -2,7 +2,5 @@
// 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.
export 'package:_fe_analyzer_shared/src/base/errors.dart'
show LocatableDiagnosticImpl;
export 'package:analyzer/src/dart/error/lint_codes.dart';
export 'package:analyzer/src/dart/error/todo_codes.dart';
pkg/analyzer/lib/src/error/listener.dart
+7 -1
View File
@@ -17,7 +17,13 @@ import 'package:analyzer/src/dart/ast/extensions.dart';
import 'package:analyzer/src/dart/element/element.dart';
import 'package:analyzer/src/dart/element/extensions.dart';
import 'package:analyzer/src/dart/element/type.dart';
import 'package:analyzer/src/diagnostic/diagnostic_message.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart'
show
DiagnosticCodeWithExpectedTypes,
DiagnosticMessage,
DiagnosticMessageImpl,
ExpectedType,
LocatedDiagnostic;
import 'package:analyzer/src/utilities/extensions/collection.dart';
import 'package:meta/meta.dart';
import 'package:source_span/source_span.dart';
pkg/analyzer/lib/src/error/type_arguments_verifier.dart
+2 -2
View File
@@ -8,15 +8,15 @@ import 'package:analyzer/dart/analysis/analysis_options.dart';
import 'package:analyzer/dart/analysis/features.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/diagnostic/diagnostic.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';
import 'package:analyzer/src/dart/element/type.dart';
import 'package:analyzer/src/dart/element/type_algebra.dart';
import 'package:analyzer/src/dart/element/type_system.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart'
show DiagnosticMessage, DiagnosticMessageImpl;
import 'package:analyzer/src/diagnostic/diagnostic.dart' as diag;
import 'package:analyzer/src/diagnostic/diagnostic_message.dart';
import 'package:analyzer/src/error/codes.dart';
import 'package:analyzer/src/error/listener.dart';
pkg/analyzer/lib/src/fasta/error_converter.dart
+2 -1
View File
@@ -6,6 +6,7 @@ import 'package:_fe_analyzer_shared/src/base/errors.dart';
import 'package:_fe_analyzer_shared/src/messages/codes.dart' show Code, Message;
import 'package:_fe_analyzer_shared/src/messages/diagnostic.dart';
import 'package:analyzer/dart/ast/token.dart' show Token;
import 'package:analyzer/diagnostic/diagnostic.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart' as diag;
import 'package:analyzer/src/diagnostic/diagnostic_code_values.dart';
import 'package:analyzer/src/error/listener.dart';
@@ -378,7 +379,7 @@ class FastaErrorReporter {
reportByCode(code.pseudoSharedCode, offset, length, message);
}
void reportScannerError(LocatedDiagnostic locatedDiagnostic) {
void reportScannerError(diag.LocatedDiagnostic locatedDiagnostic) {
diagnosticReporter?.report(locatedDiagnostic);
}
pkg/analyzer/lib/src/generated/error_verifier.dart
+2 -2
View File
@@ -15,7 +15,6 @@ import 'package:analyzer/dart/ast/token.dart';
import 'package:analyzer/dart/ast/visitor.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/diagnostic/diagnostic.dart';
import 'package:analyzer/source/source_range.dart';
import 'package:analyzer/src/dart/analysis/analysis_options.dart';
import 'package:analyzer/src/dart/analysis/file_state.dart';
@@ -32,9 +31,10 @@ import 'package:analyzer/src/dart/element/type_system.dart';
import 'package:analyzer/src/dart/element/well_bounded.dart';
import 'package:analyzer/src/dart/resolver/flow_analysis_visitor.dart';
import 'package:analyzer/src/dart/resolver/scope.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart'
show DiagnosticMessage, DiagnosticMessageImpl;
import 'package:analyzer/src/diagnostic/diagnostic.dart' as diag;
import 'package:analyzer/src/diagnostic/diagnostic_factory.dart';
import 'package:analyzer/src/diagnostic/diagnostic_message.dart';
import 'package:analyzer/src/error/codes.dart';
import 'package:analyzer/src/error/const_argument_verifier.dart';
import 'package:analyzer/src/error/constructor_fields_verifier.dart';
pkg/analyzer/lib/src/generated/resolver.dart
+2 -2
View File
@@ -24,7 +24,6 @@ import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/scope.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/dart/element/type_provider.dart';
import 'package:analyzer/diagnostic/diagnostic.dart';
import 'package:analyzer/error/listener.dart';
import 'package:analyzer/source/source.dart';
import 'package:analyzer/src/dart/ast/ast.dart';
@@ -67,8 +66,9 @@ import 'package:analyzer/src/dart/resolver/typed_literal_resolver.dart';
import 'package:analyzer/src/dart/resolver/variable_declaration_resolver.dart';
import 'package:analyzer/src/dart/resolver/yield_statement_resolver.dart';
import 'package:analyzer/src/dart/type_instantiation_target.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart'
show DiagnosticMessage, DiagnosticMessageImpl;
import 'package:analyzer/src/diagnostic/diagnostic.dart' as diag;
import 'package:analyzer/src/diagnostic/diagnostic_message.dart';
import 'package:analyzer/src/error/base_or_final_type_verifier.dart';
import 'package:analyzer/src/error/bool_expression_verifier.dart';
import 'package:analyzer/src/error/codes.dart';
pkg/analyzer/lib/src/utilities/extensions/element.dart
+2 -1
View File
@@ -8,7 +8,8 @@ import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/src/dart/element/element.dart';
import 'package:analyzer/src/dart/element/member.dart';
import 'package:analyzer/src/dart/element/type.dart';
import 'package:analyzer/src/diagnostic/diagnostic_message.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart'
show DiagnosticMessageImpl;
import 'package:meta/meta.dart';
class MockLibraryImportElement implements Element {
pkg/analyzer_plugin/api.txt
+4 -3
View File
@@ -2103,10 +2103,7 @@ dart:core:
int (referenced)
dart:isolate:
SendPort (referenced)
package:_fe_analyzer_shared/src/base/diagnostic_message.dart:
DiagnosticMessage@2 (referenced)
package:_fe_analyzer_shared/src/base/errors.dart:
Diagnostic (referenced)
DiagnosticSeverity (referenced)
DiagnosticType (referenced)
package:_fe_analyzer_shared/src/base/source_range.dart:
@@ -2143,6 +2140,8 @@ package:analyzer/dart/element/type_provider.dart:
TypeProvider (referenced)
package:analyzer/dart/element/type_system.dart:
TypeSystem (referenced)
package:analyzer/diagnostic/diagnostic.dart:
Diagnostic (referenced)
package:analyzer/file_system/file_system.dart:
Folder (referenced)
ResourceProvider (referenced)
@@ -2162,5 +2161,7 @@ package:analyzer/src/dart/ast/ast.dart:
FunctionBody (referenced)
NodeList (referenced)
TypeAnnotation (referenced)
package:analyzer/src/diagnostic/diagnostic.dart:
DiagnosticMessage@2 (referenced)
package:pub_semver/src/version.dart:
Version (referenced)
pkg/analyzer_plugin/test/utilities/analyzer_converter_test.dart
+4 -3
View File
@@ -9,8 +9,9 @@ import 'package:analyzer/source/error_processor.dart' as analyzer;
import 'package:analyzer/source/line_info.dart' as analyzer;
import 'package:analyzer/src/dart/analysis/analysis_options.dart' as analyzer;
import 'package:analyzer/src/dart/element/element.dart' as analyzer;
import 'package:analyzer/src/diagnostic/diagnostic.dart'
show DiagnosticMessageImpl;
import 'package:analyzer/src/diagnostic/diagnostic.dart' as diag;
import 'package:analyzer/src/diagnostic/diagnostic_message.dart' as analyzer;
import 'package:analyzer_plugin/protocol/protocol_common.dart' as plugin;
import 'package:analyzer_plugin/utilities/analyzer_converter.dart';
import 'package:test/test.dart';
@@ -58,14 +59,14 @@ class AnalyzerConverterTest extends AbstractSingleUnitTest {
int offset, {
String? contextMessage,
}) async {
var contextMessages = <analyzer.DiagnosticMessageImpl>[];
var contextMessages = <DiagnosticMessageImpl>[];
await resolveTestCode('');
var testSource = result.unit.declaredFragment!.source;
if (contextMessage != null) {
contextMessages.add(
analyzer.DiagnosticMessageImpl(
DiagnosticMessageImpl(
filePath: testSource.fullName,
offset: 53,
length: 7,
pkg/analyzer_testing/api.txt
+2 -1
View File
@@ -97,8 +97,9 @@ dart:core:
bool (referenced)
int (referenced)
package:_fe_analyzer_shared/src/base/errors.dart:
Diagnostic (referenced)
DiagnosticCode (referenced)
package:analyzer/diagnostic/diagnostic.dart:
Diagnostic (referenced)
package:analyzer/file_system/file_system.dart:
File (referenced)
Folder (referenced)
pkg/front_end/test/scanner_cfe_test.dart
+1 -1
View File
@@ -5,7 +5,6 @@
import 'dart:convert';
import 'dart:typed_data' show Uint8List;
import 'package:_fe_analyzer_shared/src/base/errors.dart';
import 'package:_fe_analyzer_shared/src/scanner/error_token.dart';
import 'package:_fe_analyzer_shared/src/scanner/scanner.dart'
as usedForFuzzTesting;
@@ -13,6 +12,7 @@ import 'package:_fe_analyzer_shared/src/scanner/scanner.dart';
import 'package:_fe_analyzer_shared/src/scanner/token.dart';
import 'package:_fe_analyzer_shared/src/scanner/token_constants.dart';
import 'package:analyzer/src/dart/scanner/translate_error_token.dart';
import 'package:analyzer/src/diagnostic/diagnostic.dart' show LocatedDiagnostic;
import 'package:analyzer/src/diagnostic/diagnostic.dart' as diag;
import 'package:front_end/src/codes/diagnostic.dart' as fe_diag;
import 'package:test/test.dart';
pkg/front_end/test/scanner_replacement_test.dart
+1 -1
View File
@@ -2,12 +2,12 @@
// 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:_fe_analyzer_shared/src/base/errors.dart';
import 'package:_fe_analyzer_shared/src/scanner/error_token.dart';
import 'package:_fe_analyzer_shared/src/scanner/scanner.dart';
import 'package:_fe_analyzer_shared/src/scanner/token.dart';
import 'package:analyzer/src/dart/scanner/translate_error_token.dart'
show translateErrorToken;
import 'package:analyzer/src/diagnostic/diagnostic.dart' show LocatedDiagnostic;
import 'package:analyzer/src/diagnostic/diagnostic.dart' as diag;
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
pkg/linter/lib/src/rules/prefer_final_locals.dart
+2 -2
View File
@@ -8,10 +8,10 @@ import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/visitor.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/diagnostic/diagnostic.dart';
import 'package:analyzer/error/error.dart';
import 'package:analyzer/src/dart/element/extensions.dart'; // ignore: implementation_imports
import 'package:analyzer/src/diagnostic/diagnostic_message.dart'; // ignore: implementation_imports
import 'package:analyzer/src/diagnostic/diagnostic.dart' // ignore: implementation_imports
show DiagnosticMessage, DiagnosticMessageImpl;
import '../analyzer.dart';
import '../diagnostic.dart' as diag;