languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-19 15:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

CQ. Use ErrorReporter.atEntity() where possible.

Browse source 
Change-Id: I64c44cc6883001ee9421f85320f871e64b0b36ad
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/366503
Reviewed-by: Phil Quitslund <pquitslund@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
Konstantin Shcheglov 2024-05-16 21:17:44 +00:00 committed by Commit Queue
parent ba79c308d7
commit dbc478ce81
10 changed files with 53 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/analyzer/lib/src/dart/resolver/extension_member_resolver.dart
View file

@ -107,9 +107,8 @@ class ExtensionMemberResolver {
return extension.asResolutionResult;
},
(noneMoreSpecific) {
_errorReporter.atOffset(
offset: nameEntity.offset,
length: nameEntity.length,
_errorReporter.atEntity(
entity: nameEntity,
errorCode: CompileTimeErrorCode.AMBIGUOUS_EXTENSION_MEMBER_ACCESS,
arguments: [
name,

35
pkg/analyzer/lib/src/error/best_practices_verifier.dart
View file

@ -1716,9 +1716,8 @@ class _InvalidAccessVerifier {
}
var errorEntity = node.errorEntity;
_errorReporter.atOffset(
offset: errorEntity.offset,
length: errorEntity.length,
_errorReporter.atEntity(
entity: errorEntity,
errorCode: WarningCode.INVALID_USE_OF_INTERNAL_MEMBER,
arguments: [element.displayName],
);
@ -1763,9 +1762,8 @@ class _InvalidAccessVerifier {
node = nameToken;
}
_errorReporter.atOffset(
offset: node.offset,
length: node.length,
_errorReporter.atEntity(
entity: node,
errorCode: WarningCode.INVALID_USE_OF_INTERNAL_MEMBER,
arguments: [name],
);
@ -1856,34 +1854,30 @@ class _InvalidAccessVerifier {
return;
}
if (hasDoNotSubmit) {
_errorReporter.atOffset(
offset: errorEntity.offset,
length: errorEntity.length,
_errorReporter.atEntity(
entity: errorEntity,
errorCode: WarningCode.invalid_use_of_do_not_submit_member,
arguments: [name],
);
}
if (hasProtected) {
_errorReporter.atOffset(
offset: errorEntity.offset,
length: errorEntity.length,
_errorReporter.atEntity(
entity: errorEntity,
errorCode: WarningCode.INVALID_USE_OF_PROTECTED_MEMBER,
arguments: [name, definingClass.source!.uri],
);
}
if (isVisibleForTemplateApplied) {
_errorReporter.atOffset(
offset: errorEntity.offset,
length: errorEntity.length,
_errorReporter.atEntity(
entity: errorEntity,
errorCode: WarningCode.INVALID_USE_OF_VISIBLE_FOR_TEMPLATE_MEMBER,
arguments: [name, definingClass.source!.uri],
);
}
if (hasVisibleForTesting) {
_errorReporter.atOffset(
offset: errorEntity.offset,
length: errorEntity.length,
_errorReporter.atEntity(
entity: errorEntity,
errorCode: WarningCode.INVALID_USE_OF_VISIBLE_FOR_TESTING_MEMBER,
arguments: [name, definingClass.source!.uri],
);
@ -1901,9 +1895,8 @@ class _InvalidAccessVerifier {
}
}
if (!validOverride) {
_errorReporter.atOffset(
offset: errorEntity.offset,
length: errorEntity.length,
_errorReporter.atEntity(
entity: errorEntity,
errorCode: WarningCode.INVALID_USE_OF_VISIBLE_FOR_OVERRIDING_MEMBER,
arguments: [name],
);

7
pkg/analyzer/lib/src/error/correct_override.dart
View file

@ -111,7 +111,7 @@ class CovariantParametersVerifier {
void verify({
required ErrorReporter errorReporter,
required SyntacticEntity errorNode,
required SyntacticEntity errorEntity,
}) {
var superParameters = _superParameters();
for (var entry in superParameters.entries) {
@ -126,9 +126,8 @@ class CovariantParametersVerifier {
// always named, so we can safely assume
// `_thisMember.enclosingElement3.name` and
// `superMember.enclosingElement3.name` are non-`null`.
errorReporter.atOffset(
offset: errorNode.offset,
length: errorNode.length,
errorReporter.atEntity(
entity: errorEntity,
errorCode: CompileTimeErrorCode.INVALID_OVERRIDE,
arguments: [
_thisMember.name,

10
pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart
View file

@ -349,9 +349,8 @@ class DeprecatedMemberUseVerifier extends BaseDeprecatedMemberUseVerifier {
message = message?.trim();
if (message == null || message.isEmpty || message == '.') {
_errorReporter.atOffset(
offset: errorEntity.offset,
length: errorEntity.length,
_errorReporter.atEntity(
entity: errorEntity,
errorCode: _isLibraryInWorkspacePackage(library)
? HintCode.DEPRECATED_MEMBER_USE_FROM_SAME_PACKAGE
: HintCode.DEPRECATED_MEMBER_USE,
@ -363,9 +362,8 @@ class DeprecatedMemberUseVerifier extends BaseDeprecatedMemberUseVerifier {
!message.endsWith('!')) {
message = '$message.';
}
_errorReporter.atOffset(
offset: errorEntity.offset,
length: errorEntity.length,
_errorReporter.atEntity(
entity: errorEntity,
errorCode: _isLibraryInWorkspacePackage(library)
? HintCode.DEPRECATED_MEMBER_USE_FROM_SAME_PACKAGE_WITH_MESSAGE
: HintCode.DEPRECATED_MEMBER_USE_WITH_MESSAGE,

2
pkg/analyzer/lib/src/error/inheritance_override.dart
View file

@ -395,7 +395,7 @@ class _ClassVerifier {
if (mixinIndex == -1) {
CovariantParametersVerifier(thisMember: member).verify(
errorReporter: reporter,
errorNode: node,
errorEntity: node,
);
}
}

33
pkg/analyzer/lib/src/error/required_parameters_verifier.dart
View file

@ -28,7 +28,7 @@ class RequiredParametersVerifier extends SimpleAstVisitor<void> {
_check(
parameters: element.parameters,
arguments: argumentList.arguments,
errorNode: errorNode,
errorEntity: errorNode,
);
}
}
@ -39,7 +39,7 @@ class RequiredParametersVerifier extends SimpleAstVisitor<void> {
_check(
parameters: node.constructorElement?.parameters,
arguments: node.arguments?.argumentList.arguments ?? <Expression>[],
errorNode: node.name,
errorEntity: node.name,
);
}
@ -50,7 +50,7 @@ class RequiredParametersVerifier extends SimpleAstVisitor<void> {
_check(
parameters: type.parameters,
arguments: node.argumentList.arguments,
errorNode: node,
errorEntity: node,
);
}
}
@ -60,7 +60,7 @@ class RequiredParametersVerifier extends SimpleAstVisitor<void> {
_check(
parameters: node.constructorName.staticElement?.parameters,
arguments: node.argumentList.arguments,
errorNode: node.constructorName,
errorEntity: node.constructorName,
);
}
@ -72,7 +72,7 @@ class RequiredParametersVerifier extends SimpleAstVisitor<void> {
_check(
parameters: targetType.parameters,
arguments: node.argumentList.arguments,
errorNode: node.argumentList,
errorEntity: node.argumentList,
);
return;
}
@ -81,7 +81,7 @@ class RequiredParametersVerifier extends SimpleAstVisitor<void> {
_check(
parameters: _executableElement(node.methodName.staticElement)?.parameters,
arguments: node.argumentList.arguments,
errorNode: node.methodName,
errorEntity: node.methodName,
);
}
@ -91,7 +91,7 @@ class RequiredParametersVerifier extends SimpleAstVisitor<void> {
_check(
parameters: _executableElement(node.staticElement)?.parameters,
arguments: node.argumentList.arguments,
errorNode: node,
errorEntity: node,
);
}
@ -104,7 +104,7 @@ class RequiredParametersVerifier extends SimpleAstVisitor<void> {
parameters: _executableElement(node.staticElement)?.parameters,
enclosingConstructor: enclosingConstructor,
arguments: node.argumentList.arguments,
errorNode: node,
errorEntity: node,
);
}
@ -112,7 +112,7 @@ class RequiredParametersVerifier extends SimpleAstVisitor<void> {
required List<ParameterElement>? parameters,
ConstructorElement? enclosingConstructor,
required List<Expression> arguments,
required SyntacticEntity errorNode,
required SyntacticEntity errorEntity,
}) {
if (parameters == null) {
return;
@ -123,9 +123,8 @@ class RequiredParametersVerifier extends SimpleAstVisitor<void> {
String parameterName = parameter.name;
if (!_containsNamedExpression(
enclosingConstructor, arguments, parameterName)) {
_errorReporter.atOffset(
offset: errorNode.offset,
length: errorNode.length,
_errorReporter.atEntity(
entity: errorEntity,
errorCode: CompileTimeErrorCode.MISSING_REQUIRED_ARGUMENT,
arguments: [parameterName],
);
@ -139,16 +138,14 @@ class RequiredParametersVerifier extends SimpleAstVisitor<void> {
enclosingConstructor, arguments, parameterName)) {
var reason = annotation.getReason(strictCasts: true);
if (reason != null) {
_errorReporter.atOffset(
offset: errorNode.offset,
length: errorNode.length,
_errorReporter.atEntity(
entity: errorEntity,
errorCode: WarningCode.MISSING_REQUIRED_PARAM_WITH_DETAILS,
arguments: [parameterName, reason],
);
} else {
_errorReporter.atOffset(
offset: errorNode.offset,
length: errorNode.length,
_errorReporter.atEntity(
entity: errorEntity,
errorCode: WarningCode.MISSING_REQUIRED_PARAM,
arguments: [parameterName],
);

5
pkg/analyzer/lib/src/error/type_arguments_verifier.dart
View file

@ -131,9 +131,8 @@ class TypeArgumentsVerifier {
if (!_typeSystem.isSubtypeOf(typeArgument, bound)) {
var errorTarget = typeArgumentNodes?[i] ?? node.name;
_errorReporter.atOffset(
offset: errorTarget.offset,
length: errorTarget.length,
_errorReporter.atEntity(
entity: errorTarget,
errorCode: CompileTimeErrorCode.TYPE_ARGUMENT_NOT_MATCHING_BOUNDS,
arguments: [typeArgument, typeParameter.name, bound],
);

20
pkg/analyzer/lib/src/generated/error_verifier.dart
View file

@ -4965,9 +4965,8 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
if (redirectedElement != null &&
element.isConst &&
!redirectedElement.isConst) {
errorReporter.atOffset(
offset: errorEntity.offset,
length: errorEntity.end - errorEntity.offset,
errorReporter.atEntity(
entity: errorEntity,
errorCode: CompileTimeErrorCode.REDIRECT_TO_NON_CONST_CONSTRUCTOR,
);
}
@ -5823,9 +5822,8 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
TypeParameterElementImpl typeParameterImpl =
typeParameter as TypeParameterElementImpl;
if (!variance.greaterThanOrEqual(typeParameterImpl.variance)) {
errorReporter.atOffset(
offset: errorTarget.offset,
length: errorTarget.length,
errorReporter.atEntity(
entity: errorTarget,
errorCode: CompileTimeErrorCode.WRONG_TYPE_PARAMETER_VARIANCE_POSITION,
arguments: [
typeParameterImpl.variance.keyword,
@ -6035,9 +6033,8 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
if (parameter.isRequiredNamed) {
if (parameter.defaultValue != null) {
var errorTarget = _parameterName(parameter) ?? parameter;
errorReporter.atOffset(
offset: errorTarget.offset,
length: errorTarget.length,
errorReporter.atEntity(
entity: errorTarget,
errorCode:
CompileTimeErrorCode.DEFAULT_VALUE_ON_REQUIRED_PARAMETER,
);
@ -6062,9 +6059,8 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
: CompileTimeErrorCode.MISSING_DEFAULT_VALUE_FOR_PARAMETER;
arguments = [parameterName?.lexeme ?? '?'];
}
errorReporter.atOffset(
offset: errorTarget.offset,
length: errorTarget.length,
errorReporter.atEntity(
entity: errorTarget,
errorCode: errorCode,
arguments: arguments,
);

5
pkg/analyzer/lib/src/generated/resolver.dart
View file

@ -2388,9 +2388,8 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
if (constructorElement.isFactory) {
var constructorName = node.arguments?.constructorSelector?.name;
var errorTarget = constructorName ?? node.name;
errorReporter.atOffset(
offset: errorTarget.offset,
length: errorTarget.length,
errorReporter.atEntity(
entity: errorTarget,
errorCode:
CompileTimeErrorCode.ENUM_CONSTANT_INVOKES_FACTORY_CONSTRUCTOR,
);

5
pkg/analyzer/lib/src/hint/sdk_constraint_verifier.dart
View file

@ -197,9 +197,8 @@ class SdkConstraintVerifier extends RecursiveAstVisitor<void> {
throw UnimplementedError('(${target.runtimeType}) $target');
}
}
_errorReporter.atOffset(
offset: errorEntity.offset,
length: errorEntity.length,
_errorReporter.atEntity(
entity: errorEntity,
errorCode: WarningCode.SDK_VERSION_SINCE,
arguments: [
sinceSdkVersion.toString(),