Sema: Clean up wording in some attribute-related diagnostics

Author: slavapestov

include/swift/AST/DiagnosticsSema.def

@@ -1028,9 +1028,9 @@ ERROR(static_functions_not_mutating,none,
       "static functions must not be declared mutating", ())
 
 ERROR(transparent_in_protocols_not_supported,none,
-      "@_transparent is not supported on declarations within protocols", ())
+      "'@_transparent' attribute is not supported on declarations within protocols", ())
 ERROR(transparent_in_classes_not_supported,none,
-      "@_transparent is not supported on declarations within classes", ())
+      "'@_transparent' attribute is not supported on declarations within classes", ())
 
 ERROR(invalid_iboutlet,none,
       "only instance properties can be declared @IBOutlet", ())
@@ -1124,7 +1124,7 @@ ERROR(access_control_open_bad_decl,none,
 ERROR(invalid_decl_attribute_simple,none,
       "attribute cannot be applied to declaration", ())
 ERROR(invalid_decl_attribute,none,
-      "%0 cannot be applied to this declaration", (DeclAttribute))
+      "'%0' attribute cannot be applied to this declaration", (DeclAttribute))
 ERROR(invalid_decl_modifier,none,
       "%0 modifier cannot be applied to this declaration", (DeclAttribute))
 ERROR(attribute_does_not_apply_to_type,none,
@@ -3707,7 +3707,7 @@ ERROR(class_designated_init_inlineable_resilient,none,
       "delegate to another initializer", (Type, unsigned))
 
 ERROR(attribute_invalid_on_stored_property,
-      none, "@%0 cannot be applied to stored properties", (StringRef))
+      none, "'@%0' attribute cannot be applied to stored properties", (StringRef))
 
 ERROR(inlineable_dynamic_not_supported,
       none, "'@_inlineable' attribute cannot be applied to 'dynamic' declarations", ())

test/attr/attr_inlineable.swift

@@ -2,7 +2,7 @@
 // RUN: %target-typecheck-verify-swift -swift-version 4 -enable-testing
 
 @_inlineable struct TestInlineableStruct {}
-// expected-error@-1 {{@_inlineable cannot be applied to this declaration}}
+// expected-error@-1 {{'@_inlineable' attribute cannot be applied to this declaration}}
 
 private func privateFunction() {}
 // expected-note@-1{{global function 'privateFunction()' is not '@_versioned' or public}}
@@ -24,10 +24,10 @@ public struct PublicStruct {
   public init() {}
 
   @_inlineable public var storedProperty: Int
-  // expected-error@-1 {{@_inlineable cannot be applied to stored properties}}
+  // expected-error@-1 {{'@_inlineable' attribute cannot be applied to stored properties}}
 
   @_inlineable public lazy var lazyProperty: Int = 0
-  // expected-error@-1 {{@_inlineable cannot be applied to stored properties}}
+  // expected-error@-1 {{'@_inlineable' attribute cannot be applied to stored properties}}
 }
 
 public struct Struct {

test/attr/attr_nonobjc.swift

@@ -39,10 +39,10 @@ class BlueLightSaber : LightSaber {
   init(x: String) {} // expected-error {{conflicts with previous declaration with the same Objective-C selector}}
 }
 
-@nonobjc class NonObjCClassNotAllowed { } // expected-error {{@nonobjc cannot be applied to this declaration}} {{1-10=}}
+@nonobjc class NonObjCClassNotAllowed { } // expected-error {{'@nonobjc' attribute cannot be applied to this declaration}} {{1-10=}}
 
 class NonObjCDeallocNotAllowed {
-  @nonobjc deinit { // expected-error {{@nonobjc cannot be applied to this declaration}} {{3-12=}}
+  @nonobjc deinit { // expected-error {{'@nonobjc' attribute cannot be applied to this declaration}} {{3-12=}}
 
   }
 }

test/attr/attr_objc.swift

@@ -121,7 +121,7 @@ func subject_genericFunc<T>(t: T) { // expected-error {{@objc can only be used w
 func subject_funcParam(a: @objc Int) { // expected-error {{attribute can only be applied to declarations, not types}} {{1-1=@objc }} {{27-33=}}
 }
 
-@objc // expected-error {{@objc cannot be applied to this declaration}} {{1-7=}}
+@objc // expected-error {{'@objc' attribute cannot be applied to this declaration}} {{1-7=}}
 struct subject_struct {
   @objc
   var subject_instanceVar: Int // expected-error {{@objc can only be used with members of classes, @objc protocols, and concrete extensions of classes}} {{3-8=}}
@@ -133,7 +133,7 @@ struct subject_struct {
   func subject_instanceFunc() {} // expected-error {{@objc can only be used with members of classes, @objc protocols, and concrete extensions of classes}} {{3-8=}}
 }
 
-@objc   // expected-error {{@objc cannot be applied to this declaration}} {{1-7=}}
+@objc   // expected-error {{'@objc' attribute cannot be applied to this declaration}} {{1-7=}}
 struct subject_genericStruct<T> {
   @objc
   var subject_instanceVar: Int // expected-error {{@objc can only be used with members of classes, @objc protocols, and concrete extensions of classes}} {{3-8=}}
@@ -209,7 +209,7 @@ enum subject_enum: Int {
   @objc   // expected-error {{attribute has no effect; cases within an '@objc' enum are already exposed to Objective-C}} {{3-9=}}
   case subject_enumElement5, subject_enumElement6
 
-  @nonobjc // expected-error {{@nonobjc cannot be applied to this declaration}}
+  @nonobjc // expected-error {{'@nonobjc' attribute cannot be applied to this declaration}}
   case subject_enumElement7
 
   @objc   

test/attr/attr_versioned.swift

@@ -31,7 +31,7 @@ fileprivate class filePrivateClass {
 }
 
 @_versioned extension S {}
-// expected-error@-1 {{@_versioned cannot be applied to this declaration}}
+// expected-error@-1 {{'@_versioned' attribute cannot be applied to this declaration}}
 
 @_versioned
 protocol VersionedProtocol {

test/attr/attributes.swift

@@ -17,13 +17,13 @@ func f5(x: inout binary) {}
 
 @IBDesignable
 class IBDesignableClassTy {
-  @IBDesignable func foo() {} // expected-error {{@IBDesignable cannot be applied to this declaration}} {{3-17=}}
+  @IBDesignable func foo() {} // expected-error {{'@IBDesignable' attribute cannot be applied to this declaration}} {{3-17=}}
 }
 
-@IBDesignable // expected-error {{@IBDesignable cannot be applied to this declaration}} {{1-15=}}
+@IBDesignable // expected-error {{'@IBDesignable' attribute cannot be applied to this declaration}} {{1-15=}}
 struct IBDesignableStructTy {}
 
-@IBDesignable // expected-error {{@IBDesignable cannot be applied to this declaration}} {{1-15=}}
+@IBDesignable // expected-error {{'@IBDesignable' attribute cannot be applied to this declaration}} {{1-15=}}
 protocol IBDesignableProtTy {}
 
 @IBDesignable // expected-error {{@IBDesignable can only be applied to classes and extensions of classes}} {{1-15=}}
@@ -54,21 +54,21 @@ func foo(x: @convention(block) (Int) -> Int) {}
 func zim() {}
 @_transparent
 func zung<T>(_: T) {}
-@_transparent // expected-error{{@_transparent cannot be applied to stored properties}} {{1-15=}}
+@_transparent // expected-error{{'@_transparent' attribute cannot be applied to stored properties}} {{1-15=}}
 var zippity : Int
 func zoom(x: @_transparent () -> ()) { } // expected-error{{attribute can only be applied to declarations, not types}} {{1-1=@_transparent }} {{14-28=}}
 protocol ProtoWithTransparent {
-  @_transparent// expected-error{{@_transparent is not supported on declarations within protocols}} {{3-16=}}
+  @_transparent// expected-error{{'@_transparent' attribute is not supported on declarations within protocols}} {{3-16=}}
   func transInProto()
 }
 class TestTranspClass : ProtoWithTransparent {
-  @_transparent  // expected-error{{@_transparent is not supported on declarations within classes}} {{3-17=}}
+  @_transparent  // expected-error{{'@_transparent' attribute is not supported on declarations within classes}} {{3-17=}}
   init () {}
-  @_transparent // expected-error{{@_transparent cannot be applied to this declaration}} {{3-17=}}
+  @_transparent // expected-error{{'@_transparent' attribute cannot be applied to this declaration}} {{3-17=}}
   deinit {}
-  @_transparent // expected-error{{@_transparent is not supported on declarations within classes}} {{3-17=}}
+  @_transparent // expected-error{{'@_transparent' attribute is not supported on declarations within classes}} {{3-17=}}
   class func transStatic() {}
-  @_transparent// expected-error{{@_transparent is not supported on declarations within classes}} {{3-16=}}
+  @_transparent// expected-error{{'@_transparent' attribute is not supported on declarations within classes}} {{3-16=}}
   func transInProto() {}
 }
 struct TestTranspStruct : ProtoWithTransparent{
@@ -81,33 +81,33 @@ struct TestTranspStruct : ProtoWithTransparent{
   @_transparent
   func transInProto() {}
 }
-@_transparent // expected-error{{@_transparent cannot be applied to this declaration}} {{1-15=}}
+@_transparent // expected-error{{'@_transparent' attribute cannot be applied to this declaration}} {{1-15=}}
 struct CannotHaveTransparentStruct {
   func m1() {}
 }
-@_transparent // expected-error{{@_transparent cannot be applied to this declaration}} {{1-15=}}
+@_transparent // expected-error{{'@_transparent' attribute cannot be applied to this declaration}} {{1-15=}}
 extension TestTranspClass {
   func tr1() {}
 }
-@_transparent // expected-error{{@_transparent cannot be applied to this declaration}} {{1-15=}}
+@_transparent // expected-error{{'@_transparent' attribute cannot be applied to this declaration}} {{1-15=}}
 extension TestTranspStruct {
   func tr1() {}
 }
-@_transparent // expected-error{{@_transparent cannot be applied to this declaration}} {{1-15=}}
+@_transparent // expected-error{{'@_transparent' attribute cannot be applied to this declaration}} {{1-15=}}
 extension binary {
   func tr1() {}
 }
 
 class transparentOnClassVar {
-  @_transparent var max: Int { return 0xFF }; // expected-error {{@_transparent is not supported on declarations within classes}} {{3-17=}}
+  @_transparent var max: Int { return 0xFF }; // expected-error {{'@_transparent' attribute is not supported on declarations within classes}} {{3-17=}}
   func blah () {
     var _: Int = max
   }
 };
 
 class transparentOnClassVar2 {
   var max: Int {
-    @_transparent // expected-error {{@_transparent is not supported on declarations within classes}} {{5-19=}}
+    @_transparent // expected-error {{'@_transparent' attribute is not supported on declarations within classes}} {{5-19=}}
     get {
       return 0xFF
     }
@@ -206,18 +206,18 @@ func func_type_attribute_with_space(x: @convention (c) () -> Int) {} // OK. Know
 var thinFunc : @thin () -> () // expected-error {{attribute is not supported}}
 
 @inline(never) func nolineFunc() {}
-@inline(never) var noinlineVar : Int // expected-error {{@inline(never) cannot be applied to this declaration}} {{1-16=}}
-@inline(never) class FooClass { // expected-error {{@inline(never) cannot be applied to this declaration}} {{1-16=}}
+@inline(never) var noinlineVar : Int // expected-error {{'@inline(never)' attribute cannot be applied to this declaration}} {{1-16=}}
+@inline(never) class FooClass { // expected-error {{'@inline(never)' attribute cannot be applied to this declaration}} {{1-16=}}
 }
 
 @inline(__always) func AlwaysInlineFunc() {}
-@inline(__always) var alwaysInlineVar : Int // expected-error {{@inline(__always) cannot be applied to this declaration}} {{1-19=}}
-@inline(__always) class FooClass2 { // expected-error {{@inline(__always) cannot be applied to this declaration}} {{1-19=}}
+@inline(__always) var alwaysInlineVar : Int // expected-error {{'@inline(__always)' attribute cannot be applied to this declaration}} {{1-19=}}
+@inline(__always) class FooClass2 { // expected-error {{'@inline(__always)' attribute cannot be applied to this declaration}} {{1-19=}}
 }
 
 @_optimize(speed) func OspeedFunc() {}
-@_optimize(speed) var OpeedVar : Int // expected-error {{@_optimize(speed) cannot be applied to stored properties}} {{1-19=}}
-@_optimize(speed) class OspeedClass { // expected-error {{@_optimize(speed) cannot be applied to this declaration}} {{1-19=}}
+@_optimize(speed) var OpeedVar : Int // expected-error {{'@_optimize(speed)' attribute cannot be applied to stored properties}} {{1-19=}}
+@_optimize(speed) class OspeedClass { // expected-error {{'@_optimize(speed)' attribute cannot be applied to this declaration}} {{1-19=}}
 }
 
 class A {
@@ -251,7 +251,7 @@ class C {
     @_optimize(size) set {
     }
   }
-  @_optimize(size) var c : Int // expected-error {{@_optimize(size) cannot be applied to stored properties}}
+  @_optimize(size) var c : Int // expected-error {{'@_optimize(size)' attribute cannot be applied to stored properties}}
 }
 
 class SILStored {

test/decl/var/NSManaged_properties.swift

@@ -8,7 +8,7 @@ class X : NSObject {
   func foo() -> X { return self }
 }
 
-@NSManaged struct SomeStruct {} // expected-error {{@NSManaged cannot be applied to this declaration}}
+@NSManaged struct SomeStruct {} // expected-error {{'@NSManaged' attribute cannot be applied to this declaration}}
 
 @NSManaged var global: Int // expected-error {{@NSManaged only allowed on an instance property or method}}