Elements. Deprecate Annotatable.metadata2, use 'metadata' instead.

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

Author: scheglov

pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart

@@ -27,7 +27,7 @@ Element convertElement(engine.Element element) {
       isPrivate: element.isPrivate,
       isDeprecated:
           (element is engine.Annotatable) &&
-          (element as engine.Annotatable).metadata2.hasDeprecated,
+          (element as engine.Annotatable).metadata.hasDeprecated,
       isAbstract: _isAbstract(element),
       isConst: _isConst(element),
       isFinal: _isFinal(element),
@@ -139,7 +139,7 @@ Element convertLibraryFragment(LibraryFragmentImpl fragment) {
     path.basename(fragment.source.fullName),
     Element.makeFlags(
       isPrivate: fragment.isPrivate,
-      isDeprecated: fragment.library.metadata2.hasDeprecated,
+      isDeprecated: fragment.library.metadata.hasDeprecated,
     ),
     location: newLocation_fromFragment(fragment),
   );
@@ -193,7 +193,7 @@ String? getParametersString(engine.Element element) {
     }
     if (parameter.isRequiredNamed) {
       sb.write('required ');
-    } else if (parameter.metadata2.hasDeprecated) {
+    } else if (parameter.metadata.hasDeprecated) {
       sb.write('@required ');
     }
     parameter.appendToWithoutDelimiters(sb);
@@ -261,13 +261,13 @@ int _preferRequiredParams(
   engine.FormalParameterElement e2,
 ) {
   var rank1 =
-      (e1.isRequiredNamed || e1.metadata2.hasRequired)
+      (e1.isRequiredNamed || e1.metadata.hasRequired)
           ? 0
           : !e1.isNamed
           ? -1
           : 1;
   var rank2 =
-      (e2.isRequiredNamed || e2.metadata2.hasRequired)
+      (e2.isRequiredNamed || e2.metadata.hasRequired)
           ? 0
           : !e2.isNamed
           ? -1

pkg/analysis_server/lib/src/computer/computer_hover.dart

@@ -68,7 +68,7 @@ class DartUnitHoverComputer {
         hover.elementDescription = _elementDisplayString(node, element);
         hover.elementKind = element.kind.displayName;
         if (element case Annotatable a) {
-          hover.isDeprecated = a.metadata2.hasDeprecated;
+          hover.isDeprecated = a.metadata.hasDeprecated;
         }
         // not local element
         if (element.enclosingElement is! ExecutableElement) {

pkg/analysis_server/lib/src/computer/computer_outline.dart

@@ -535,7 +535,7 @@ class _FunctionBodyOutlinesVisitor extends RecursiveAstVisitor<void> {
   /// Return `true` if the given [element] is the method 'group' defined in the
   /// test package.
   bool isGroup(engine.ExecutableElement? element) {
-    if (element != null && element.metadata2.hasIsTestGroup) {
+    if (element != null && element.metadata.hasIsTestGroup) {
       return true;
     }
     return element is engine.TopLevelFunctionElement &&
@@ -546,7 +546,7 @@ class _FunctionBodyOutlinesVisitor extends RecursiveAstVisitor<void> {
   /// Return `true` if the given [element] is the method 'test' defined in the
   /// test package.
   bool isTest(engine.ExecutableElement? element) {
-    if (element != null && element.metadata2.hasIsTest) {
+    if (element != null && element.metadata.hasIsTest) {
       return true;
     }
     return element is engine.TopLevelFunctionElement &&

pkg/analysis_server/lib/src/lsp/completion_utils.dart

@@ -620,7 +620,7 @@ CompletionDetail _getCompletionDetail(
   var detail = fullSignature;
   if (element != null &&
       (element is Annotatable &&
-          (element as Annotatable).metadata2.hasDeprecated) &&
+          (element as Annotatable).metadata.hasDeprecated) &&
       !supportsDeprecated) {
     // If the item is deprecated and we don't support the native deprecated flag
     // then include it in the details.

pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/editable_arguments_mixin.dart

@@ -188,8 +188,8 @@ extension on InvocationExpressionImpl {
     };
 
     return switch (element) {
-      FragmentedAnnotatableElementMixin(:var metadata2) =>
-        metadata2.hasWidgetFactory,
+      FragmentedAnnotatableElementMixin(:var metadata) =>
+        metadata.hasWidgetFactory,
       _ => false,
     };
   }

pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/handler_editable_arguments.dart

@@ -245,7 +245,7 @@ class EditableArgumentsHandler
       isRequired: parameter.isRequired,
       isNullable:
           parameter.type.nullabilitySuffix == NullabilitySuffix.question,
-      isDeprecated: parameter.metadata2.hasDeprecated,
+      isDeprecated: parameter.metadata.hasDeprecated,
       isEditable: notEditableReason == null,
       notEditableReason: notEditableReason,
     );

pkg/analysis_server/lib/src/services/completion/dart/override_helper.dart

@@ -66,11 +66,11 @@ class OverrideHelper {
   bool _hasNonVirtualAnnotation(ExecutableElement element) {
     if (element is GetterElement && element.isSynthetic) {
       var variable = element.variable3;
-      if (variable != null && variable.metadata2.hasNonVirtual) {
+      if (variable != null && variable.metadata.hasNonVirtual) {
         return true;
       }
     }
-    return element.metadata2.hasNonVirtual;
+    return element.metadata.hasNonVirtual;
   }
 
   /// Returns the list of names that belong to [interfaceElement], but are not

pkg/analysis_server/lib/src/services/completion/dart/relevance_computer.dart

@@ -209,7 +209,7 @@ class RelevanceComputer {
         );
       case NamedArgumentSuggestion():
         var parameter = suggestion.parameter;
-        if (parameter.isRequiredNamed || parameter.metadata2.hasRequired) {
+        if (parameter.isRequiredNamed || parameter.metadata.hasRequired) {
           return Relevance.requiredNamedArgument;
         } else {
           return Relevance.namedArgument;

pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart

@@ -842,7 +842,7 @@ class SuggestionBuilder {
       completion,
       selectionRange.offset - offsetDelta,
       selectionRange.length,
-      element.metadata2.hasDeprecated,
+      element.metadata.hasDeprecated,
       false,
       displayText: displayText,
       requiredImports: overrideImports.toList(),

pkg/analysis_server/lib/src/services/completion/dart/utilities.dart

@@ -110,7 +110,7 @@ CompletionDefaultArgumentList computeCompletionDefaultArgumentList(
   }
 
   for (var param in namedParams) {
-    if (param.metadata2.hasRequired || param.isRequiredNamed) {
+    if (param.metadata.hasRequired || param.isRequiredNamed) {
       if (sb.isNotEmpty) {
         sb.write(', ');
       }