Reword @objcImpl diagnostics to avoid “an”

…and also adopt new DiagnosticEngine features.

Author: beccadax

include/swift/AST/DiagnosticsSema.def

@@ -1694,9 +1694,9 @@ ERROR(attr_objc_implementation_no_conformance,none,
       (Type, bool))
 
 ERROR(member_of_objc_implementation_not_objc_or_final,none,
-      "%0 %1 does not match any %0 declared in the headers for %2; did you use "
-      "the %0's Swift name?",
-      (DescriptiveDeclKind, ValueDecl *, ValueDecl *))
+      "%kind0 does not match any %kindonly0 declared in the headers for %1; "
+      "did you use the %kindonly0's Swift name?",
+      (ValueDecl *, ValueDecl *))
 NOTE(fixit_add_private_for_objc_implementation,none,
      "add 'private' or 'fileprivate' to define an Objective-C-compatible %0 "
      "not declared in the header",
@@ -1730,56 +1730,56 @@ ERROR(objc_implementation_required_attr_mismatch,none,
       (ValueDecl *, DescriptiveDeclKind, bool))
 
 ERROR(objc_implementation_candidate_has_error_convention,none,
-      "%0 %1 does not match the declaration in the header because it throws an "
+      "%kind0 does not match the declaration in the header because it throws an "
       "error",
-      (DescriptiveDeclKind, ValueDecl *))
+      (const ValueDecl *))
 
 ERROR(objc_implementation_candidate_lacks_error_convention,none,
-      "%0 %1 does not match the declaration in the header because it does not "
+      "%kind0 does not match the declaration in the header because it does not "
       "throw an error",
-      (DescriptiveDeclKind, ValueDecl *))
+      (const ValueDecl *))
 
 #define SELECT_FOREIGN_ERROR_CONVENTION_KIND \
       "select{returning zero|returning non-zero|returning zero or a result|" \
       "returning nil|setting the error parameter|%error}"
 
 ERROR(objc_implementation_mismatched_error_convention_kind,none,
-      "%0 %1 does not match the declaration in the header because it indicates "
-      "an error by %" SELECT_FOREIGN_ERROR_CONVENTION_KIND "2, rather than by "
-      "%" SELECT_FOREIGN_ERROR_CONVENTION_KIND "3",
-      (DescriptiveDeclKind, ValueDecl *, unsigned, unsigned))
+      "%kind0 does not match the declaration in the header because it indicates "
+      "an error by %" SELECT_FOREIGN_ERROR_CONVENTION_KIND "1, rather than by "
+      "%" SELECT_FOREIGN_ERROR_CONVENTION_KIND "2",
+      (const ValueDecl *, unsigned, unsigned))
 
 ERROR(objc_implementation_mismatched_error_convention_index,none,
-      "%0 %1 does not match the declaration in the header because it uses "
-      "parameter #%2 for the error, not parameter #%3; a selector part called "
+      "%kind0 does not match the declaration in the header because it uses "
+      "parameter #%1 for the error, not parameter #%2; a selector part called "
       "'error:' can control which parameter to use",
-      (DescriptiveDeclKind, ValueDecl *, unsigned, unsigned))
+      (const ValueDecl *, unsigned, unsigned))
 
 ERROR(objc_implementation_mismatched_error_convention_void_param,none,
-      "%0 %1 does not match the declaration in the header because it "
-      "%select{removes the error parameter|makes the error parameter 'Void'}2 "
-      "rather than %select{making it 'Void'|removing it}2",
-      (DescriptiveDeclKind, ValueDecl *, bool))
+      "%kind0 does not match the declaration in the header because it "
+      "%select{removes the error parameter|makes the error parameter 'Void'}1 "
+      "rather than %select{making it 'Void'|removing it}1",
+      (const ValueDecl *, bool))
 
 ERROR(objc_implementation_mismatched_error_convention_ownership,none,
-      "%0 %1 does not match the declaration in the header because it "
-      "%select{does not own|owns}2 the error parameter",
-      (DescriptiveDeclKind, ValueDecl *, bool))
+      "%kind0 does not match the declaration in the header because it "
+      "%select{does not own|owns}1 the error parameter",
+      (const ValueDecl *, bool))
 
 ERROR(objc_implementation_mismatched_error_convention_other,none,
-      "%0 %1 does not match the declaration in the header because it uses a "
+      "%kind0 does not match the declaration in the header because it uses a "
       "different Objective-C error convention; please file a bug report with a "
       "sample project, as the compiler should be able to describe the mismatch",
-      (DescriptiveDeclKind, ValueDecl *))
+      (const ValueDecl *))
 
 ERROR(objc_implementation_wrong_objc_name,none,
       "selector %0 for %kind1 not found in header; did you mean %2?",
       (ObjCSelector, ValueDecl *, ObjCSelector))
 
 ERROR(objc_implementation_wrong_swift_name,none,
-      "selector %0 used in header by an %1 with a different name; did you "
-      "mean %2?",
-      (ObjCSelector, DescriptiveDeclKind, DeclName))
+      "selector %0 used in header by %kindonly1 with a different name; did "
+      "you mean %1?",
+      (ObjCSelector, const ValueDecl *))
 
 ERROR(objc_implementation_missing_impl,none,
       "extension for %select{main class interface|category %0}0 should "

lib/Sema/TypeCheckDeclObjC.cpp

@@ -3379,8 +3379,7 @@ class ObjCImplementationChecker {
 
     case MatchOutcome::WrongSwiftName: {
       auto diag = diagnose(cand, diag::objc_implementation_wrong_swift_name,
-                           reqObjCName, req->getDescriptiveKind(),
-                           req->getName());
+                           reqObjCName, req);
       fixDeclarationName(diag, cand, req->getName());
       if (!explicitObjCName) {
         // Changing the Swift name will probably change the implicitly-computed
@@ -3444,38 +3443,36 @@ class ObjCImplementationChecker {
       if (reqConv && !candConv)
         diagnose(cand,
                  diag::objc_implementation_candidate_has_error_convention,
-                 cand->getDescriptiveKind(), cand);
+                 cand);
       else if (!reqConv && candConv)
         diagnose(cand,
                  diag::objc_implementation_candidate_lacks_error_convention,
-                 cand->getDescriptiveKind(), cand);
+                 cand);
       else if (reqConv->getKind() != candConv->getKind())
         diagnose(cand,
                  diag::objc_implementation_mismatched_error_convention_kind,
-                 cand->getDescriptiveKind(), cand, candConv->getKind(),
-                 reqConv->getKind());
+                 cand, candConv->getKind(), reqConv->getKind());
       else if (reqConv->getErrorParameterIndex()
                   != candConv->getErrorParameterIndex())
         diagnose(cand,
                  diag::objc_implementation_mismatched_error_convention_index,
-                 cand->getDescriptiveKind(), cand,
+                 cand,
                  candConv->getErrorParameterIndex() + 1,
                  reqConv->getErrorParameterIndex() + 1);
       else if (reqConv->isErrorParameterReplacedWithVoid()
                   != candConv->isErrorParameterReplacedWithVoid())
         diagnose(cand,
                  diag::objc_implementation_mismatched_error_convention_void_param,
-                 cand->getDescriptiveKind(), cand,
-                 candConv->isErrorParameterReplacedWithVoid());
+                 cand, candConv->isErrorParameterReplacedWithVoid());
       else if (reqConv->isErrorOwned() != candConv->isErrorOwned())
         diagnose(cand,
                  diag::objc_implementation_mismatched_error_convention_ownership,
-                 cand->getDescriptiveKind(), cand, candConv->isErrorOwned());
+                 cand, candConv->isErrorOwned());
       else
         // Catch-all; probably shouldn't happen.
         diagnose(cand,
                  diag::objc_implementation_mismatched_error_convention_other,
-                 cand->getDescriptiveKind(), cand);
+                 cand);
 
       return;
     }
@@ -3524,8 +3521,7 @@ class ObjCImplementationChecker {
       auto cand = pair.first;
 
       diagnose(cand, diag::member_of_objc_implementation_not_objc_or_final,
-               cand->getDescriptiveKind(), cand,
-               cand->getDeclContext()->getSelfClassDecl());
+               cand, cand->getDeclContext()->getSelfClassDecl());
 
       if (canBeRepresentedInObjC(cand))
         diagnose(cand, diag::fixit_add_private_for_objc_implementation,

test/decl/ext/objc_implementation.swift

@@ -258,7 +258,7 @@ protocol EmptySwiftProto {}
   }
 
   func methodObjCName3() {
-    // expected-error@-1 {{selector 'methodObjCName3' used in header by an instance method with a different name; did you mean 'methodSwiftName3()'?}} {{8-23=methodSwiftName3}} {{3-3=@objc(methodObjCName3) }}
+    // expected-error@-1 {{selector 'methodObjCName3' used in header by instance method with a different name; did you mean 'methodSwiftName3()'?}} {{8-23=methodSwiftName3}} {{3-3=@objc(methodObjCName3) }}
     // FIXME: probably needs an @objc too, since the name is not explicit
   }
 
@@ -267,11 +267,11 @@ protocol EmptySwiftProto {}
   }
 
   @objc(methodObjCName5) func methodWrongSwiftName5() {
-    // expected-error@-1 {{selector 'methodObjCName5' used in header by an instance method with a different name; did you mean 'methodSwiftName5()'?}} {{31-52=methodSwiftName5}}
+    // expected-error@-1 {{selector 'methodObjCName5' used in header by instance method with a different name; did you mean 'methodSwiftName5()'?}} {{31-52=methodSwiftName5}}
   }
 
   @objc(methodObjCName6A) func methodSwiftName6B() {
-    // expected-error@-1 {{selector 'methodObjCName6A' used in header by an instance method with a different name; did you mean 'methodSwiftName6A()'?}} {{32-49=methodSwiftName6A}}
+    // expected-error@-1 {{selector 'methodObjCName6A' used in header by instance method with a different name; did you mean 'methodSwiftName6A()'?}} {{32-49=methodSwiftName6A}}
   }
 }