[Diagnostics] Adjust ExtraneousArgumentsFailure note diagnostic

Author: LucianoPAlmeida

include/swift/AST/DiagnosticsSema.def

@@ -1403,10 +1403,13 @@ WARNING(unlabeled_trailing_closure_deprecated,Deprecation,
 NOTE(decl_multiple_defaulted_closure_parameters,none,
      "%0 contains defaulted closure parameters %1 and %2",
      (DeclName, Identifier, Identifier))
+NOTE(candidate_with_extraneous_args_closure,none,
+     "candidate %0 requires %1 argument%s1, "
+     "but %2 %select{were|was}3 used in closure body",
+     (Type, unsigned, unsigned, bool))
 NOTE(candidate_with_extraneous_args,none,
-      "candidate %0 requires %1 argument%s1, "
-      "but %2 %select{were|was}3 %select{provided|used in closure body}4",
-      (Type, unsigned, unsigned, bool, bool))
+     "candidate %0 has %1 parameter%s1, but context %2 has %3",
+     (Type, unsigned, Type, unsigned))
 
 ERROR(no_accessible_initializers,none,
       "%0 cannot be constructed because it has no accessible initializers",

lib/Sema/CSDiagnostics.cpp

@@ -5735,9 +5735,15 @@ bool ExtraneousArgumentsFailure::diagnoseAsNote() {
 
   auto *decl = overload->choice.getDecl();
   auto numArgs = getTotalNumArguments();
-  emitDiagnosticAt(decl, diag::candidate_with_extraneous_args, ContextualType,
-                   ContextualType->getNumParams(), numArgs, (numArgs == 1),
-                   isExpr<ClosureExpr>(getAnchor()));
+  if (isExpr<ClosureExpr>(getAnchor())) {
+    emitDiagnosticAt(decl, diag::candidate_with_extraneous_args_closure,
+                    ContextualType, ContextualType->getNumParams(), numArgs,
+                    (numArgs == 1));
+  } else {
+    emitDiagnosticAt(decl, diag::candidate_with_extraneous_args,
+                     decl->getInterfaceType(), numArgs, ContextualType,
+                     ContextualType->getNumParams());
+  }
   return true;
 }