DiagnosticEngine: Do not describe an accessor's storage for %kindonly

This is the desired behavior is most cases. In the future, we should
consider adding format specifiers for short/detailed descriptions.

Author: AnthonyLatsis

lib/AST/DiagnosticEngine.cpp

@@ -874,11 +874,13 @@ static void formatDiagnosticArgument(StringRef Modifier,
       assert(Modifier.empty() && "Improper modifier for ValueDecl argument");
     }
 
-    // If it's an accessor, describe that and then switch to discussing its
-    // storage.
-    if (auto accessor = dyn_cast<AccessorDecl>(D)) {
-      Out << Decl::getDescriptiveKindName(D->getDescriptiveKind()) << " for ";
-      D = accessor->getStorage();
+    if (includeName) {
+      // If it's an accessor, describe that and then switch to discussing its
+      // storage.
+      if (auto accessor = dyn_cast<AccessorDecl>(D)) {
+        Out << Decl::getDescriptiveKindName(D->getDescriptiveKind()) << " for ";
+        D = accessor->getStorage();
+      }
     }
 
     // If it's an extension, describe that and then switch to discussing its

test/Sema/availability_accessors.swift

@@ -555,18 +555,18 @@ struct TestPatternBindingInitExprs {
 
 struct BadAccessorAvailability<T> {
   var alwaysUnavailableObservers: T  {
-    @available(*, unavailable) // expected-error {{willSet observer for property cannot be marked unavailable with '@available'}}
+    @available(*, unavailable) // expected-error {{willSet observer cannot be marked unavailable with '@available'}}
     willSet { }
 
-    @available(*, unavailable) // expected-error {{didSet observer for property cannot be marked unavailable with '@available'}}
+    @available(*, unavailable) // expected-error {{didSet observer cannot be marked unavailable with '@available'}}
     didSet { }
   }
 
   var observersUnavailableBeforeSwift99: T  {
-    @available(swift, introduced: 99) // expected-error {{willSet observer for property cannot be marked unavailable with '@available'}}
+    @available(swift, introduced: 99) // expected-error {{willSet observer cannot be marked unavailable with '@available'}}
     willSet { }
 
-    @available(swift, introduced: 99) // expected-error {{didSet observer for property cannot be marked unavailable with '@available'}}
+    @available(swift, introduced: 99) // expected-error {{didSet observer cannot be marked unavailable with '@available'}}
     didSet { }
   }
 }

test/Sema/availability_versions.swift

@@ -1920,26 +1920,26 @@ class StoredPropertiesWithAvailabilityInClosures {
 
 struct PropertyObservers {
   var hasPotentiallyUnavailableObservers: Int {
-    @available(macOS 51, *) // expected-error {{willSet observer for property cannot be marked potentially unavailable with '@available'}}
+    @available(macOS 51, *) // expected-error {{willSet observer cannot be marked potentially unavailable with '@available'}}
     willSet { }
 
-    @available(macOS 51, *) // expected-error {{didSet observer for property cannot be marked potentially unavailable with '@available'}}
+    @available(macOS 51, *) // expected-error {{didSet observer cannot be marked potentially unavailable with '@available'}}
     didSet { }
   }
 
   var hasObsoletedObservers: Int {
-    @available(macOS, obsoleted: 10.9) // expected-error {{willSet observer for property cannot be marked unavailable with '@available'}}
+    @available(macOS, obsoleted: 10.9) // expected-error {{willSet observer cannot be marked unavailable with '@available'}}
     willSet { }
 
-    @available(macOS, obsoleted: 10.9) // expected-error {{didSet observer for property cannot be marked unavailable with '@available'}}
+    @available(macOS, obsoleted: 10.9) // expected-error {{didSet observer cannot be marked unavailable with '@available'}}
     didSet { }
   }
 
   var hasSPIAvailableObservers: Int {
-    @_spi_available(macOS, introduced: 10.9) // expected-error {{willSet observer for property cannot be marked unavailable with '@available'}}
+    @_spi_available(macOS, introduced: 10.9) // expected-error {{willSet observer cannot be marked unavailable with '@available'}}
     willSet { }
 
-    @_spi_available(macOS, introduced: 10.9) // expected-error {{didSet observer for property cannot be marked unavailable with '@available'}}
+    @_spi_available(macOS, introduced: 10.9) // expected-error {{didSet observer cannot be marked unavailable with '@available'}}
     didSet { }
   }