analyzer: Guard DotShorthandConstructorInvocation from Deprecated.instantiate

DotShorthandConstructorInvocation does not have a ConstructorName,
so we convert `DeprecatedFunctionalityVerifier.constructorName` into
`._checkForDeprecatedInstantiate`, and then call that in
`constructorName`, `dotShorthandConstructorInvocation` and
`instanceCreationExpression`.


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

Author: srawlins

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

@@ -31,27 +31,25 @@ class DeprecatedFunctionalityVerifier {
   }
 
   void constructorName(ConstructorName node) {
-    var classElement = node.type.element;
-    if (classElement == null) return;
-    if (classElement.isDeprecatedWithKind('instantiate')) {
-      _diagnosticReporter.atNode(
-        node,
-        WarningCode.deprecatedInstantiate,
-        arguments: [classElement.name!],
-      );
-    }
+    var interfaceElement = node.type.element;
+    if (interfaceElement is! InterfaceElement) return;
+    _checkForDeprecatedInstantiate(element: interfaceElement, errorNode: node);
   }
 
   void dotShorthandConstructorInvocation(
     DotShorthandConstructorInvocation node,
   ) {
-    var element = node.constructorName.element;
-    if (element is! ExecutableElement) return;
+    var element = node.element;
+    if (element is! ConstructorElement) return;
     _checkForDeprecatedOptional(
       element: element,
       argumentList: node.argumentList,
       errorNode: node.constructorName,
     );
+    _checkForDeprecatedInstantiate(
+      element: element.enclosingElement,
+      errorNode: node.constructorName,
+    );
   }
 
   void dotShorthandInvocation(DotShorthandInvocation node) {
@@ -77,6 +75,12 @@ class DeprecatedFunctionalityVerifier {
       argumentList: node.argumentList,
       errorNode: node.constructorName,
     );
+    var interfaceElement = node.constructorName.type.element;
+    if (interfaceElement is! InterfaceElement) return;
+    _checkForDeprecatedInstantiate(
+      element: interfaceElement,
+      errorNode: node.constructorName,
+    );
   }
 
   void methodInvocation(MethodInvocation node) {
@@ -143,6 +147,19 @@ class DeprecatedFunctionalityVerifier {
     }
   }
 
+  void _checkForDeprecatedInstantiate({
+    required InterfaceElement element,
+    required AstNode errorNode,
+  }) {
+    if (element.isDeprecatedWithKind('instantiate')) {
+      _diagnosticReporter.atNode(
+        errorNode,
+        WarningCode.deprecatedInstantiate,
+        arguments: [element.name!],
+      );
+    }
+  }
+
   void _checkForDeprecatedMixin(WithClause? node) {
     if (node == null) return;
     for (var mixin in node.mixinTypes) {

pkg/analyzer/test/src/diagnostics/deprecated_instantiate_test.dart

@@ -30,6 +30,36 @@ var x = Foo();
     );
   }
 
+  test_annotatedClass_dotShorthand() async {
+    newFile('$testPackageLibPath/foo.dart', r'''
+@Deprecated.instantiate()
+class Foo {}
+''');
+    await assertErrorsInCode(
+      r'''
+import 'foo.dart';
+Foo x = .new();
+''',
+      [error(WarningCode.deprecatedInstantiate, 28, 3)],
+    );
+  }
+
+  test_annotatedClass_dotShorthand_named() async {
+    newFile('$testPackageLibPath/foo.dart', r'''
+@Deprecated.instantiate()
+class Foo {
+  Foo.named();
+}
+''');
+    await assertErrorsInCode(
+      r'''
+import 'foo.dart';
+Foo x = .named();
+''',
+      [error(WarningCode.deprecatedInstantiate, 28, 5)],
+    );
+  }
+
   test_annotatedClass_redirectedFactory_named() async {
     newFile('$testPackageLibPath/foo.dart', r'''
 import 'test.dart';
@@ -93,7 +123,6 @@ class Bar extends Foo {
 @Deprecated.instantiate()
 class Foo {}
 ''');
-
     await assertNoErrorsInCode(r'''
 import 'foo.dart';
 class Bar extends Foo {
@@ -130,6 +159,22 @@ var x = Foo2();
 ''');
   }
 
+  test_annotatedClass_typedef_dotShorthand() async {
+    newFile('$testPackageLibPath/foo.dart', r'''
+@Deprecated.instantiate()
+class Foo {}
+typedef Foo2 = Foo;
+''');
+
+    await assertErrorsInCode(
+      r'''
+import 'foo.dart';
+Foo2 x = .new();
+''',
+      [error(WarningCode.deprecatedInstantiate, 29, 3)],
+    );
+  }
+
   test_annotatedClass_typedef_tearoff() async {
     newFile('$testPackageLibPath/foo.dart', r'''
 @Deprecated.instantiate()