Merge pull request #4287 from CodaFi/handy-mannys-big-constructor-job

Fix @available renaming for renamed initializers

Author: CodaFi

lib/Sema/MiscDiagnostics.cpp

@@ -1397,18 +1397,18 @@ void swift::fixItAvailableAttrRename(TypeChecker &TC,
     if (parsed.isMember()) {
       diag.fixItReplace(call->getFn()->getSourceRange(), parsed.ContextName);
 
-    } else {
-      auto *dotCall = dyn_cast<DotSyntaxCallExpr>(call->getFn());
-      if (!dotCall)
-        return;
-
+    } else if (auto *dotCall = dyn_cast<DotSyntaxCallExpr>(call->getFn())) {
       SourceLoc removeLoc = dotCall->getDotLoc();
       if (removeLoc.isInvalid())
         return;
 
       diag.fixItRemove(SourceRange(removeLoc, dotCall->getFn()->getEndLoc()));
+    } else if (!isa<ConstructorRefCallExpr>(call->getFn())) {
+      return;
     }
 
+    // Continue on to diagnose any constructor argument label renames.
+    
   } else {
     // Just replace the base name.
     SmallString<64> baseReplace;

test/1_stdlib/StringDiagnostics_without_Foundation.swift

@@ -27,5 +27,5 @@ func testStringCollectionTypes(s: String) {
 struct NotLosslessStringConvertible {}
 
 func testStringInitT() {
-  _ = String(NotLosslessStringConvertible()) // expected-error{{'init' has been renamed to 'init(describing:)}}
+  _ = String(NotLosslessStringConvertible()) // expected-error{{'init' has been renamed to 'init(describing:)}}{{14-14=describing: }}
 }