Continue improving initializers in @available(renamed:).

Refinement of d858cc9. Handle members renamed to initializers as well
as free functions renamed to initializers.

Author: jrose-apple

lib/Sema/MiscDiagnostics.cpp

@@ -1115,11 +1115,23 @@ void swift::fixItAvailableAttrRename(TypeChecker &TC,
 
     // Continue on to diagnose any argument label renames.
 
-  } else if (parsed.BaseName == TC.Context.Id_init.str() &&
-             parsed.isMember() && CE) {
+  } else if (parsed.BaseName == TC.Context.Id_init.str() && CE) {
     // For initializers, replace with a "call" of the context type...but only
     // if we know we're doing a call (rather than a first-class reference).
-    diag.fixItReplace(referenceRange, parsed.ContextName);
+    if (parsed.isMember()) {
+      diag.fixItReplace(CE->getFn()->getSourceRange(), parsed.ContextName);
+
+    } else {
+      auto *dotCall = dyn_cast<DotSyntaxCallExpr>(CE->getFn());
+      if (!dotCall)
+        return;
+
+      SourceLoc removeLoc = dotCall->getDotLoc();
+      if (removeLoc.isInvalid())
+        return;
+
+      diag.fixItRemove(SourceRange(removeLoc, dotCall->getFn()->getEndLoc()));
+    }
 
   } else {
     // Just replace the base name.
@@ -1231,11 +1243,13 @@ describeRename(ASTContext &ctx, const AvailableAttr *attr,
   // Only produce special descriptions for renames to
   // - instance members
   // - properties (or global bindings)
-  // - class/static methods (and initializers)
+  // - class/static methods
+  // - initializers, even if unqualified
   // Leave non-member renames alone, as well as renames from top-level types
   // and bindings to member types and class/static properties.
   if (!(parsed.isInstanceMember() || parsed.isPropertyAccessor() ||
-        (parsed.isMember() && parsed.IsFunctionName))) {
+        (parsed.isMember() && parsed.IsFunctionName) ||
+        (parsed.BaseName == ctx.Id_init.str()))) {
     return None;
   }
 

test/attr/attr_availability.swift

@@ -478,3 +478,21 @@ func testRenameSetters() {
   var x = 0
   unavailableSetInstancePropertyInout(a: &x, b: 2) // expected-error{{'unavailableSetInstancePropertyInout(a:b:)' has been replaced by property 'Int.prop'}} {{3-38=x.prop}} {{38-49= = }} {{50-51=}}
 }
+
+extension Int {
+  @available(*, unavailable, renamed: "init(other:)")
+  static func factory(other: Int) -> Int { return other } // expected-note 2 {{here}}
+
+  @available(*, unavailable, renamed: "Int.init(other:)")
+  static func factory2(other: Int) -> Int { return other } // expected-note 2 {{here}}
+
+  static func testFactoryMethods() {
+    factory(other: 1) // expected-error {{'factory(other:)' has been replaced by 'init(other:)'}} {{none}}
+    factory2(other: 1) // expected-error {{'factory2(other:)' has been replaced by 'Int.init(other:)'}} {{5-13=Int}}
+  }
+}
+
+func testFactoryMethods() {
+  Int.factory(other: 1) // expected-error {{'factory(other:)' has been replaced by 'init(other:)'}} {{6-14=}}
+  Int.factory2(other: 1) // expected-error {{'factory2(other:)' has been replaced by 'Int.init(other:)'}} {{3-15=Int}}
+}