[analyzer] Allow deprecated uses inside deprecated enums and extensions

Bug: #51664 Change-Id: I65847a704e8a1dc17b47f2783d009669c703b1e5 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/287674 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]>
dart-lang · Mar 15, 2023 · 7e72be6 · 7e72be6
1 parent 295e210
commit 7e72be6
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 0 deletions.
diff --git a/pkg/analyzer/lib/src/error/best_practices_verifier.dart b/pkg/analyzer/lib/src/error/best_practices_verifier.dart
@@ -476,6 +476,18 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
     super.visitDefaultFormalParameter(node);
   }
 
+  @override
+  void visitEnumDeclaration(EnumDeclaration node) {
+    _deprecatedVerifier
+        .pushInDeprecatedValue(node.declaredElement!.hasDeprecated);
+
+    try {
+      super.visitEnumDeclaration(node);
+    } finally {
+      _deprecatedVerifier.popInDeprecated();
+    }
+  }
+
   @override
   void visitExportDirective(ExportDirective node) {
     _deprecatedVerifier.exportDirective(node);
@@ -491,6 +503,18 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
     super.visitExpressionFunctionBody(node);
   }
 
+  @override
+  void visitExtensionDeclaration(ExtensionDeclaration node) {
+    _deprecatedVerifier
+        .pushInDeprecatedValue(node.declaredElement!.hasDeprecated);
+
+    try {
+      super.visitExtensionDeclaration(node);
+    } finally {
+      _deprecatedVerifier.popInDeprecated();
+    }
+  }
+
   @override
   void visitFieldDeclaration(FieldDeclaration node) {
     _deprecatedVerifier.pushInDeprecatedMetadata(node.metadata);

diff --git a/pkg/analyzer/test/src/diagnostics/deprecated_member_use_test.dart b/pkg/analyzer/test/src/diagnostics/deprecated_member_use_test.dart
@@ -785,6 +785,36 @@ class C {
 ''');
   }
 
+  test_inDeprecatedEnum() async {
+    await assertNoErrorsInCode(r'''
+@deprecated
+void f() {}
+
+@deprecated
+enum E {
+  one, two;
+
+  void m() {
+    f();
+  }
+}
+''');
+  }
+
+  test_inDeprecatedExtension() async {
+    await assertNoErrorsInCode(r'''
+@deprecated
+void f() {}
+
+@deprecated
+extension E on int {
+  void m() {
+    f();
+  }
+}
+''');
+  }
+
   test_inDeprecatedField() async {
     await assertNoErrorsInCode(r'''
 @deprecated
@@ -892,6 +922,38 @@ f(A a) {
     ]);
   }
 
+  test_inEnum() async {
+    await assertErrorsInCode(r'''
+@deprecated
+void f() {}
+
+enum E {
+  one, two;
+
+  void m() {
+    f();
+  }
+}
+''', [
+      error(HintCode.DEPRECATED_MEMBER_USE_FROM_SAME_PACKAGE, 64, 1),
+    ]);
+  }
+
+  test_inExtension() async {
+    await assertErrorsInCode(r'''
+@deprecated
+void f() {}
+
+extension E on int {
+  void m() {
+    f();
+  }
+}
+''', [
+      error(HintCode.DEPRECATED_MEMBER_USE_FROM_SAME_PACKAGE, 63, 1),
+    ]);
+  }
+
   test_instanceCreation_namedConstructor() async {
     await assertErrorsInCode(r'''
 class A {