Correct deprecated-use message for constructors

Change-Id: I9e8535a63ef9baeb741cb9f5d47015590b8031e7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/292620
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>

Author: srawlins

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

@@ -183,13 +183,12 @@ abstract class BaseDeprecatedMemberUseVerifier {
 
     String displayName = element!.displayName;
     if (element is ConstructorElement) {
-      // TODO(jwren) We should modify ConstructorElement.getDisplayName(),
+      // TODO(jwren) We should modify ConstructorElement.displayName,
       // or have the logic centralized elsewhere, instead of doing this logic
       // here.
-      displayName = element.enclosingElement.displayName;
-      if (element.displayName.isNotEmpty) {
-        displayName = "$displayName.${element.displayName}";
-      }
+      displayName = element.name == ''
+          ? '${element.displayName}.new'
+          : element.displayName;
     } else if (element is LibraryElement) {
       displayName = element.definingCompilationUnit.source.uri.toString();
     } else if (node is MethodInvocation &&

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

@@ -795,8 +795,7 @@ f() {
           HintCode.DEPRECATED_MEMBER_USE,
           48,
           7,
-          // TODO(srawlins): Fix this message!
-          messageContains: ["'A.A.named' is deprecated and shouldn't be used."],
+          messageContains: ["'A.named' is deprecated and shouldn't be used."],
         ),
       ],
     );
@@ -1429,7 +1428,8 @@ class B extends A {
 }
 ''',
       [
-        error(HintCode.DEPRECATED_MEMBER_USE, 57, 13),
+        error(HintCode.DEPRECATED_MEMBER_USE, 57, 13,
+            text: "'A.named' is deprecated and shouldn't be used."),
       ],
     );
   }
@@ -1449,8 +1449,7 @@ class B extends A {
 ''',
       [
         error(HintCode.DEPRECATED_MEMBER_USE, 57, 7,
-            // TODO(srawlins): Correct this message!
-            text: "'A.A' is deprecated and shouldn't be used."),
+            text: "'A.new' is deprecated and shouldn't be used."),
       ],
     );
   }