AST: Quote attributes more consistently in DiagnosticsSema.def

Author: AnthonyLatsis

include/swift/AST/DiagnosticsSema.def

@@ -29,7 +29,7 @@ func bezierPathElementToInteger(_ e: NSBezierPathElement) -> Int {
 }
 
 func integerToBezierPathElement(_ i: Int) -> NSBezierPathElement {
-  // expected-note@-1 2 {{add @available attribute to enclosing global function}}
+  // expected-note@-1 2 {{add '@available' attribute to enclosing global function}}
   switch i {
   case 1:
     return .moveTo

test/ClangImporter/availability_macosx.swift

@@ -161,11 +161,11 @@ func testNonConstVoid() {
 
 class NuclearFridge: CCRefrigerator {} // expected-error {{cannot inherit from Core Foundation type 'CCRefrigerator'}}
 extension CCRefrigerator {
-  @objc func foo() {} // expected-error {{method cannot be marked @objc because Core Foundation types are not classes in Objective-C}}
+  @objc func foo() {} // expected-error {{method cannot be marked '@objc' because Core Foundation types are not classes in Objective-C}}
   func bar() {} // okay, implicitly non-objc
 }
 
 protocol SwiftProto {}
 @objc protocol ObjCProto {}
-extension CCRefrigerator: ObjCProto {} // expected-error {{Core Foundation class 'CCRefrigerator' cannot conform to @objc protocol 'ObjCProto' because Core Foundation types are not classes in Objective-C}}
+extension CCRefrigerator: ObjCProto {} // expected-error {{Core Foundation class 'CCRefrigerator' cannot conform to '@objc' protocol 'ObjCProto' because Core Foundation types are not classes in Objective-C}}
 extension CCRefrigerator: SwiftProto {}

test/ClangImporter/cf.swift

@@ -118,7 +118,7 @@ func testError() {
 
 #if ERRORS
 class ObjCTest {
-  @objc func foo() -> TestError {} // expected-error {{method cannot be marked @objc because its result type cannot be represented in Objective-C}} expected-note {{Swift structs cannot be represented in Objective-C}}
+  @objc func foo() -> TestError {} // expected-error {{method cannot be marked '@objc' because its result type cannot be represented in Objective-C}} expected-note {{Swift structs cannot be represented in Objective-C}}
   @objc func bar() -> TestError.Code {} // okay
 }
 #endif

test/ClangImporter/enum-error.swift

@@ -11,7 +11,7 @@
 import ImageInitializers
 
 final class MyImage : Image {
-  // CHECK: non-@objc initializer 'init(imageLiteralResourceName:)' is declared in extension of 'Image' and cannot be overridden
+  // CHECK: non-'@objc' initializer 'init(imageLiteralResourceName:)' is declared in extension of 'Image' and cannot be overridden
   // Make sure we aren't emitting a fixit into the extant module...
   // CHECK-NOT: add '@objc' to make this declaration overridable
   // CHECK: ImageInitializers.Image.init:{{.*}}: note: overridden declaration is here

test/ClangImporter/objc-cross-module-override.swift

@@ -28,7 +28,7 @@ func testInstanceTypeFactoryMethodInherited() {
 }
 
 func testFactoryWithLaterIntroducedInit() {
-    // expected-note @-1 4{{add @available attribute to enclosing global function}}
+    // expected-note @-1 4{{add '@available' attribute to enclosing global function}}
   // Prefer importing more available factory initializer over less
   // less available convenience initializer
   _ = NSHavingConvenienceFactoryAndLaterConvenienceInit(flim:5)

test/ClangImporter/objc_factory_method.swift

@@ -84,8 +84,8 @@ class SomeCellSub5 : SomeCell {
 }
 
 class FailSub : FailBase {
-  override init(value: Int) { try! super.init(value: value) } // expected-error {{overriding a throwing @objc initializer with a non-throwing initializer is not supported}}
-  override class func processValue() {} // expected-error {{overriding a throwing @objc method with a non-throwing method is not supported}}
+  override init(value: Int) { try! super.init(value: value) } // expected-error {{overriding a throwing '@objc' initializer with a non-throwing initializer is not supported}}
+  override class func processValue() {} // expected-error {{overriding a throwing '@objc' method with a non-throwing method is not supported}}
 }
 
 class CallbackSubA : CallbackBase {

test/ClangImporter/objc_override.swift

@@ -648,24 +648,24 @@ class NewtypeUser {
   @objc func stringNewtype(a: SNTErrorDomain) {} // expected-error {{'SNTErrorDomain' has been renamed to 'ErrorDomain'}}{{31-45=ErrorDomain}}
   @objc func stringNewtypeOptional(a: SNTErrorDomain?) {} // expected-error {{'SNTErrorDomain' has been renamed to 'ErrorDomain'}}{{39-53=ErrorDomain}}
   @objc func intNewtype(a: MyInt) {}
-  @objc func intNewtypeOptional(a: MyInt?) {} // expected-error {{method cannot be marked @objc because the type of the parameter cannot be represented in Objective-C}}
-  @objc func intNewtypeArray(a: [MyInt]) {} // expected-error {{method cannot be marked @objc because the type of the parameter cannot be represented in Objective-C}}
+  @objc func intNewtypeOptional(a: MyInt?) {} // expected-error {{method cannot be marked '@objc' because the type of the parameter cannot be represented in Objective-C}}
+  @objc func intNewtypeArray(a: [MyInt]) {} // expected-error {{method cannot be marked '@objc' because the type of the parameter cannot be represented in Objective-C}}
   // expected-note@-1 {{Swift structs cannot be represented in Objective-C}}
-  @objc func intNewtypeDictionary(a: [MyInt: NSObject]) {} // expected-error {{method cannot be marked @objc because the type of the parameter cannot be represented in Objective-C}}
+  @objc func intNewtypeDictionary(a: [MyInt: NSObject]) {} // expected-error {{method cannot be marked '@objc' because the type of the parameter cannot be represented in Objective-C}}
   // expected-note@-1 {{Swift structs cannot be represented in Objective-C}}
   @objc func cfNewtype(a: CFNewType) {}
-  @objc func cfNewtypeArray(a: [CFNewType]) {} // expected-error {{method cannot be marked @objc because the type of the parameter cannot be represented in Objective-C}}
+  @objc func cfNewtypeArray(a: [CFNewType]) {} // expected-error {{method cannot be marked '@objc' because the type of the parameter cannot be represented in Objective-C}}
   // expected-note@-1 {{Swift structs cannot be represented in Objective-C}}
 
   typealias MyTuple = (Int, AnyObject?)
   typealias MyNamedTuple = (a: Int, b: AnyObject?)
 
   @objc func blockWithTypealias(_ input: @escaping (MyTuple) -> MyInt) {}
-  // expected-error@-1{{method cannot be marked @objc because the type of the parameter cannot be represented in Objective-C}}
+  // expected-error@-1{{method cannot be marked '@objc' because the type of the parameter cannot be represented in Objective-C}}
   // expected-note@-2{{function types cannot be represented in Objective-C}}
 
   @objc func blockWithTypealiasWithNames(_ input: (MyNamedTuple) -> MyInt) {}
-  // expected-error@-1{{method cannot be marked @objc because the type of the parameter cannot be represented in Objective-C}}
+  // expected-error@-1{{method cannot be marked '@objc' because the type of the parameter cannot be represented in Objective-C}}
   // expected-note@-2{{function types cannot be represented in Objective-C}}
 }
 

test/ClangImporter/objc_parse.swift

@@ -3,7 +3,7 @@
 import ObjCRuntimeVisible
 
 extension A {
-  @objc func foo() { } // expected-error{{instance method cannot be marked @objc because class 'A' is only visible via the Objective-C runtime}}
+  @objc func foo() { } // expected-error{{instance method cannot be marked '@objc' because class 'A' is only visible via the Objective-C runtime}}
   func bar() {} // okay, implicitly non-objc
 }
 
@@ -16,5 +16,5 @@ class B : A { } // expected-error{{cannot inherit from class 'A' because it is o
 protocol SwiftProto {}
 @objc protocol ObjCProto {}
 
-extension A: ObjCProto {} // expected-error {{class 'A' cannot conform to @objc protocol 'ObjCProto' because the class is only visible via the Objective-C runtime}}
+extension A: ObjCProto {} // expected-error {{class 'A' cannot conform to '@objc' protocol 'ObjCProto' because the class is only visible via the Objective-C runtime}}
 extension A: SwiftProto {} // okay

test/ClangImporter/objc_runtime_visible.swift

@@ -36,10 +36,10 @@ actor A {
   var x: Int = 0 // expected-note{{add '@objc' to expose this property to Objective-C}}
 
   @objc var y: Int = 0 // expected-note{{add '@objc' to expose this property to Objective-C}}
-  // expected-error@-1{{actor-isolated property 'y' cannot be @objc}}
+  // expected-error@-1{{actor-isolated property 'y' cannot be '@objc'}}
 
   // expected-note@+1 {{add '@objc' to expose this property to Objective-C}}
-  @objc var computed : Int { // expected-error{{actor-isolated property 'computed' cannot be @objc}}
+  @objc var computed : Int { // expected-error{{actor-isolated property 'computed' cannot be '@objc'}}
     get { 120 }
   }
 
@@ -50,7 +50,7 @@ actor A {
 
 actor Dril: NSObject {
   // expected-note@+2 {{add 'async' to function 'postSynchronouslyTo(twitter:)' to make it asynchronous}}
-  // expected-error@+1 {{actor-isolated instance method 'postSynchronouslyTo(twitter:)' cannot be @objc}}
+  // expected-error@+1 {{actor-isolated instance method 'postSynchronouslyTo(twitter:)' cannot be '@objc'}}
   @objc func postSynchronouslyTo(twitter msg: String) -> Bool {
     return true
   }