Skip to content

Commit c98a91f

Browse files
scheglovCommit Queue
authored andcommitted
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 <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent d2252b1 commit c98a91f

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

pkg/analyzer/lib/src/dart/element/extensions.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'package:analyzer/dart/element/type.dart';
99
import 'package:analyzer/src/dart/element/element.dart';
1010
import 'package:analyzer/src/dart/element/type.dart';
1111
import 'package:analyzer/src/generated/utilities_dart.dart';
12-
import 'package:analyzer/src/utilities/extensions/element.dart';
1312
import 'package:analyzer/src/utilities/extensions/string.dart';
1413
import 'package:meta/meta_meta.dart';
1514

@@ -120,7 +119,7 @@ extension ElementAnnotationExtensions on ElementAnnotation {
120119
if (interfaceElement == null) {
121120
return const <TargetKind>{};
122121
}
123-
for (var annotation in interfaceElement.metadata) {
122+
for (var annotation in interfaceElement.metadata2.annotations) {
124123
if (annotation.isTarget) {
125124
var value = annotation.computeConstantValue();
126125
if (value == null) {

pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,9 @@ abstract class BaseDeprecatedMemberUseVerifier {
258258
}
259259
element = variable;
260260
}
261-
var annotation = element.metadata.firstWhereOrNull((e) => e.isDeprecated);
261+
var annotation = element.metadataAnnotations.firstWhereOrNull(
262+
(e) => e.isDeprecated,
263+
);
262264
if (annotation == null || annotation.element2 is PropertyAccessorElement) {
263265
return null;
264266
}

pkg/analyzer/lib/src/generated/ffi_verifier.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -305,12 +305,12 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
305305
// Ensure there is at most one @DefaultAsset annotation per library
306306
var hasDefaultAsset = false;
307307

308-
if (node.element2 case LibraryElement library) {
309-
for (var metadata in library.metadata) {
310-
var annotationValue = metadata.computeConstantValue();
308+
if (node.element2 case LibraryElementImpl library) {
309+
for (var annotation in library.metadata2.annotations) {
310+
var annotationValue = annotation.computeConstantValue();
311311
if (annotationValue != null && annotationValue.isDefaultAsset) {
312312
if (hasDefaultAsset) {
313-
var name = (metadata as ElementAnnotationImpl).annotationAst.name;
313+
var name = annotation.annotationAst.name;
314314
_errorReporter.atNode(
315315
name,
316316
FfiCode.FFI_NATIVE_INVALID_DUPLICATE_DEFAULT_ASSET,
@@ -454,7 +454,7 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
454454
formalParameterList?.parameters ?? <FormalParameter>[];
455455
var hadNativeAnnotation = false;
456456

457-
for (var annotation in declarationElement.metadata) {
457+
for (var annotation in declarationElement.metadataAnnotations) {
458458
var annotationValue = annotation.computeConstantValue();
459459
var annotationType = annotationValue?.type; // Native<T>
460460

@@ -1738,7 +1738,7 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
17381738
};
17391739

17401740
if (referencedElement != null) {
1741-
for (var annotation in referencedElement.metadata) {
1741+
for (var annotation in referencedElement.metadataAnnotations) {
17421742
var value = annotation.computeConstantValue();
17431743
var annotationType = value?.type;
17441744

pkg/analyzer/lib/src/summary2/bundle_writer.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class BundleWriter {
110110

111111
// Write resolution data for the library.
112112
_sink.writeUInt30(_resolutionSink.offset);
113-
_resolutionSink._writeAnnotationList(libraryElement.metadata);
113+
_resolutionSink._writeAnnotationList(libraryElement.metadata2.annotations);
114114
_resolutionSink.writeElement(libraryElement.entryPoint2);
115115
_writeFieldNameNonPromotabilityInfo(
116116
libraryElement.fieldNameNonPromotabilityInfo,

pkg/analyzer/lib/src/utilities/extensions/element.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ extension Element2Extension on Element {
164164
return false;
165165
}
166166

167-
List<ElementAnnotation> get metadata {
167+
List<ElementAnnotation> get metadataAnnotations {
168168
if (this case Annotatable annotatable) {
169169
return annotatable.metadata2.annotations;
170170
}

pkg/analyzer/test/src/dart/element/element_test.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'package:analyzer/dart/constant/value.dart';
66
import 'package:analyzer/dart/element/element.dart';
77
import 'package:analyzer/dart/element/type.dart';
88
import 'package:analyzer/src/dart/element/type.dart';
9-
import 'package:analyzer/src/utilities/extensions/element.dart';
109
import 'package:test/test.dart';
1110
import 'package:test_reflective_loader/test_reflective_loader.dart';
1211

@@ -43,7 +42,7 @@ main() {
4342
var argument = findNode.integerLiteral('3');
4443
var parameter = argument.correspondingParameter!;
4544

46-
ElementAnnotation annotation = parameter.metadata[0];
45+
ElementAnnotation annotation = parameter.metadata2.annotations[0];
4746

4847
DartObject value = annotation.computeConstantValue()!;
4948
expect(value.getField('f')!.toStringValue(), 'x');

0 commit comments

Comments
 (0)