analyzer: Simplify DeprecatedMemberUseVerifier re: annotations

Change-Id: I8cd87e16eea83d5f24d3289e12e53aa2a64cb821
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/443920
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>

Author: srawlins

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

@@ -406,7 +406,9 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
 
   @override
   void visitFieldDeclaration(FieldDeclaration node) {
-    _deprecatedMemberUseVerifier.pushInDeprecatedMetadata(node.metadata);
+    _deprecatedMemberUseVerifier.pushInDeprecatedValue(
+      node.firstVariableElement.isUseDeprecated,
+    );
 
     try {
       super.visitFieldDeclaration(node);
@@ -781,7 +783,9 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
 
   @override
   void visitTopLevelVariableDeclaration(TopLevelVariableDeclaration node) {
-    _deprecatedMemberUseVerifier.pushInDeprecatedMetadata(node.metadata);
+    _deprecatedMemberUseVerifier.pushInDeprecatedValue(
+      node.firstVariableElement.isUseDeprecated,
+    );
 
     if (!_invalidAccessVerifier._inTestDirectory) {
       for (var decl in node.variables.variables) {

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

@@ -95,11 +95,6 @@ abstract class BaseDeprecatedMemberUseVerifier {
     _checkForDeprecated(node.element, node);
   }
 
-  void pushInDeprecatedMetadata(List<Annotation> metadata) {
-    var hasDeprecated = _hasDeprecatedUseAnnotation(metadata);
-    pushInDeprecatedValue(hasDeprecated);
-  }
-
   void pushInDeprecatedValue(bool value) {
     var newValue = _inDeprecatedMemberStack.last || value;
     _inDeprecatedMemberStack.add(newValue);
@@ -263,21 +258,6 @@ abstract class BaseDeprecatedMemberUseVerifier {
         constantValue?.getField('expires')?.toStringValue();
   }
 
-  /// Whether [annotations] includes an annotation indicating "deprecated use."
-  ///
-  /// This amounts to any annotation using `deprecated` or `Deprecated()` (the
-  /// default constructor) from `dart:core`.
-  static bool _hasDeprecatedUseAnnotation(List<Annotation> annotations) {
-    var deprecatedAnnotations = annotations
-        .map((a) => a.elementAnnotation)
-        .nonNulls
-        .where((a) => a.isDeprecated);
-    return deprecatedAnnotations.any((deprecated) {
-      var value = deprecated.computeConstantValue();
-      return value?.getField('_isUse')?.toBoolValue() ?? true;
-    });
-  }
-
   /// Returns whether [element] is a [FormalParameterElement] declared in
   /// [node].
   static bool _isLocalParameter(Element? element, AstNode? node) {

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

@@ -164,6 +164,16 @@ extension ExtensionElementExtension on ExtensionElement {
       extendedType.ifTypeOrNull<InterfaceType>()?.element;
 }
 
+extension FieldDeclarationExtension on FieldDeclaration {
+  Element get firstVariableElement =>
+      fields.variables.first.declaredFragment!.element;
+}
+
+extension TopLevelVariableDeclarationExtension on TopLevelVariableDeclaration {
+  Element get firstVariableElement =>
+      variables.variables.first.declaredFragment!.element;
+}
+
 extension VariableDeclarationExtension on VariableDeclaration {
   FieldElementImpl get declaredFieldElement {
     return declaredFragment!.element as FieldElementImpl;

pkg/linter/lib/src/rules/deprecated_member_use_from_same_package.dart

@@ -14,6 +14,7 @@ import 'package:analyzer/error/error.dart';
 import 'package:analyzer/src/dart/element/extensions.dart'; // ignore: implementation_imports
 import 'package:analyzer/src/error/deprecated_member_use_verifier.dart' // ignore: implementation_imports
     show BaseDeprecatedMemberUseVerifier;
+import 'package:analyzer/src/utilities/extensions/ast.dart'; // ignore: implementation_imports
 import 'package:analyzer/workspace/workspace.dart';
 
 import '../analyzer.dart';
@@ -132,7 +133,7 @@ class _RecursiveVisitor extends RecursiveAstVisitor<void> {
     if (library == null) {
       return;
     }
-    _deprecatedVerifier.pushInDeprecatedValue(library.metadata.hasDeprecated);
+    _deprecatedVerifier.pushInDeprecatedValue(library.isUseDeprecated);
 
     super.visitCompilationUnit(node);
   }
@@ -192,7 +193,9 @@ class _RecursiveVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitFieldDeclaration(FieldDeclaration node) {
-    _deprecatedVerifier.pushInDeprecatedMetadata(node.metadata);
+    _deprecatedVerifier.pushInDeprecatedValue(
+      node.firstVariableElement.isUseDeprecated,
+    );
 
     try {
       super.visitFieldDeclaration(node);
@@ -320,7 +323,9 @@ class _RecursiveVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitTopLevelVariableDeclaration(TopLevelVariableDeclaration node) {
-    _deprecatedVerifier.pushInDeprecatedMetadata(node.metadata);
+    _deprecatedVerifier.pushInDeprecatedValue(
+      node.firstVariableElement.isUseDeprecated,
+    );
 
     try {
       super.visitTopLevelVariableDeclaration(node);