Elements. Rename Element2Extension.metadata to metadataAnnotations.
In a separate CL I'd like to deprecate Annotatable.metadata2, and
add `metadata` instead, so this extension method would be hidden.
Change-Id: I8258d5a0d1bd8443a0cfca3b438b3d5ae9d40bb2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/431941
Reviewed-by: Paul Berry <paulberry@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/dart/element/extensions.dart b/pkg/analyzer/lib/src/dart/element/extensions.dart
index 1552e79..49ae52f 100644
--- a/pkg/analyzer/lib/src/dart/element/extensions.dart
+++ b/pkg/analyzer/lib/src/dart/element/extensions.dart
@@ -9,7 +9,6 @@
import 'package:analyzer/src/dart/element/element.dart';
import 'package:analyzer/src/dart/element/type.dart';
import 'package:analyzer/src/generated/utilities_dart.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
import 'package:analyzer/src/utilities/extensions/string.dart';
import 'package:meta/meta_meta.dart';
@@ -120,7 +119,7 @@
if (interfaceElement == null) {
return const <TargetKind>{};
}
- for (var annotation in interfaceElement.metadata) {
+ for (var annotation in interfaceElement.metadata2.annotations) {
if (annotation.isTarget) {
var value = annotation.computeConstantValue();
if (value == null) {
diff --git a/pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart b/pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart
index 8491022..356ff72 100644
--- a/pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart
+++ b/pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart
@@ -258,7 +258,9 @@
}
element = variable;
}
- var annotation = element.metadata.firstWhereOrNull((e) => e.isDeprecated);
+ var annotation = element.metadataAnnotations.firstWhereOrNull(
+ (e) => e.isDeprecated,
+ );
if (annotation == null || annotation.element2 is PropertyAccessorElement) {
return null;
}
diff --git a/pkg/analyzer/lib/src/generated/ffi_verifier.dart b/pkg/analyzer/lib/src/generated/ffi_verifier.dart
index ed0238e..4e6770c 100644
--- a/pkg/analyzer/lib/src/generated/ffi_verifier.dart
+++ b/pkg/analyzer/lib/src/generated/ffi_verifier.dart
@@ -305,12 +305,12 @@
// Ensure there is at most one @DefaultAsset annotation per library
var hasDefaultAsset = false;
- if (node.element2 case LibraryElement library) {
- for (var metadata in library.metadata) {
- var annotationValue = metadata.computeConstantValue();
+ if (node.element2 case LibraryElementImpl library) {
+ for (var annotation in library.metadata2.annotations) {
+ var annotationValue = annotation.computeConstantValue();
if (annotationValue != null && annotationValue.isDefaultAsset) {
if (hasDefaultAsset) {
- var name = (metadata as ElementAnnotationImpl).annotationAst.name;
+ var name = annotation.annotationAst.name;
_errorReporter.atNode(
name,
FfiCode.FFI_NATIVE_INVALID_DUPLICATE_DEFAULT_ASSET,
@@ -454,7 +454,7 @@
formalParameterList?.parameters ?? <FormalParameter>[];
var hadNativeAnnotation = false;
- for (var annotation in declarationElement.metadata) {
+ for (var annotation in declarationElement.metadataAnnotations) {
var annotationValue = annotation.computeConstantValue();
var annotationType = annotationValue?.type; // Native<T>
@@ -1738,7 +1738,7 @@
};
if (referencedElement != null) {
- for (var annotation in referencedElement.metadata) {
+ for (var annotation in referencedElement.metadataAnnotations) {
var value = annotation.computeConstantValue();
var annotationType = value?.type;
diff --git a/pkg/analyzer/lib/src/summary2/bundle_writer.dart b/pkg/analyzer/lib/src/summary2/bundle_writer.dart
index b2ceb56..3fde53c 100644
--- a/pkg/analyzer/lib/src/summary2/bundle_writer.dart
+++ b/pkg/analyzer/lib/src/summary2/bundle_writer.dart
@@ -110,7 +110,7 @@
// Write resolution data for the library.
_sink.writeUInt30(_resolutionSink.offset);
- _resolutionSink._writeAnnotationList(libraryElement.metadata);
+ _resolutionSink._writeAnnotationList(libraryElement.metadata2.annotations);
_resolutionSink.writeElement(libraryElement.entryPoint2);
_writeFieldNameNonPromotabilityInfo(
libraryElement.fieldNameNonPromotabilityInfo,
diff --git a/pkg/analyzer/lib/src/utilities/extensions/element.dart b/pkg/analyzer/lib/src/utilities/extensions/element.dart
index 7917667..6a87606 100644
--- a/pkg/analyzer/lib/src/utilities/extensions/element.dart
+++ b/pkg/analyzer/lib/src/utilities/extensions/element.dart
@@ -164,7 +164,7 @@
return false;
}
- List<ElementAnnotation> get metadata {
+ List<ElementAnnotation> get metadataAnnotations {
if (this case Annotatable annotatable) {
return annotatable.metadata2.annotations;
}
diff --git a/pkg/analyzer/test/src/dart/element/element_test.dart b/pkg/analyzer/test/src/dart/element/element_test.dart
index 3dd29f4..46963ff 100644
--- a/pkg/analyzer/test/src/dart/element/element_test.dart
+++ b/pkg/analyzer/test/src/dart/element/element_test.dart
@@ -6,7 +6,6 @@
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/src/dart/element/type.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -43,7 +42,7 @@
var argument = findNode.integerLiteral('3');
var parameter = argument.correspondingParameter!;
- ElementAnnotation annotation = parameter.metadata[0];
+ ElementAnnotation annotation = parameter.metadata2.annotations[0];
DartObject value = annotation.computeConstantValue()!;
expect(value.getField('f')!.toStringValue(), 'x');
