Merge pull request #59993 from LucianoPAlmeida/fix-it-rename-noop

[Diagnostics] Do not emit rename fix-it if call function has the same name

Author: LucianoPAlmeida

lib/Sema/TypeCheckAvailability.cpp

@@ -2397,13 +2397,40 @@ static void fixItAvailableAttrRename(InFlightDiagnostic &diag,
                         ("." + baseReplace.str() + "(").str());
       diag.fixItReplace(SE->getEndLoc(), ")");
     } else {
-      if (parsed.IsFunctionName && parsed.ArgumentLabels.empty() &&
-          isa<VarDecl>(renamedDecl)) {
-        // If we're going from a var to a function with no arguments, emit an
-        // empty parameter list.
-        baseReplace += "()";
+      bool shouldEmitRenameFixit = true;
+      if (auto *CE = dyn_cast_or_null<CallExpr>(call)) {
+        SmallString<64> callContextName;
+        llvm::raw_svector_ostream name(callContextName);
+        if (auto *DCE = dyn_cast<DotSyntaxCallExpr>(CE->getDirectCallee())) {
+          if (auto *TE = dyn_cast<TypeExpr>(DCE->getBase())) {
+            TE->getTypeRepr()->print(name);
+            if (!parsed.ContextName.empty()) {
+              // If there is a context in rename function e.g.
+              // `Context.function()` and call context is a `DotSyntaxCallExpr`
+              // adjust the range so it replaces the base as well.
+              referenceRange =
+                  SourceRange(TE->getStartLoc(), referenceRange.End);
+            }
+          }
+        }
+        // Function names are the same(including context if applicable), so
+        // renaming fix-it doesn't need do be produced.
+        if ((parsed.ContextName.empty() ||
+             parsed.ContextName == callContextName) &&
+            CE->getCalledValue()->getBaseName() == parsed.BaseName) {
+          shouldEmitRenameFixit = false;
+        }
+      }
+      if (shouldEmitRenameFixit) {
+        if (parsed.IsFunctionName && parsed.ArgumentLabels.empty() &&
+            isa<VarDecl>(renamedDecl)) {
+          // If we're going from a var to a function with no arguments, emit an
+          // empty parameter list.
+          baseReplace += "()";
+        }
+
+        diag.fixItReplace(referenceRange, baseReplace);
       }
-      diag.fixItReplace(referenceRange, baseReplace);
     }
   }
 

test/Sema/deprecation_osx.swift

@@ -165,3 +165,60 @@ func functionWithDeprecatedMethodInDeadElseBranch() {
     let _ = ClassDeprecatedIn10_9()  // no-warning
   }
 }
+
+// https://github.com/apple/swift/issues/59843
+class I59843_A {
+  @available(macOS, deprecated: 10.51, renamed: "configure(with:)")
+  static func configure(a: String, b: String) {}
+
+  static func configure(with: Int) {}
+
+  @available(macOS, deprecated: 10.51, renamed: "method(with:)")
+  func method(a: String, b: String) {}
+
+  func method(with: Int) {}
+
+  func f() {
+    self.method(a: "a", b: "b") // expected-warning{{'method(a:b:)' was deprecated in macOS 10.51: renamed to 'method(with:)'}}
+    // expected-note@-1{{use 'method(with:)' instead}} {{none}} 
+  }
+}
+
+class I59843_B {
+  @available(macOS, deprecated: 10.51, renamed: "configure(with:and:)")
+  static func configure(a: String, b: String) {}
+
+  static func configure(with: Int, and: Int) {}
+  
+  @available(macOS, deprecated: 10.51, renamed: "method(with:and:)")
+  func method(a: String, b: String) {}
+
+  func method(with: Int, and: Int) {}
+
+  // Context
+  @available(macOS, deprecated: 10.51, renamed: "I59843_B.context(with:and:)")
+  static func context(a: String, b: String) {}
+
+  static func context(with: Int, and: Int) {}
+
+  @available(macOS, deprecated: 10.51, renamed: "I59843_A.contextDiff(with:and:)")
+  static func contextDiff(a: String, b: String) {}
+
+  static func contextDiff(with: Int, and: Int) {}
+  
+  func f() {
+    self.method(a: "a", b: "b") // expected-warning{{'method(a:b:)' was deprecated in macOS 10.51: renamed to 'method(with:and:)'}}
+    // expected-note@-1{{use 'method(with:and:)' instead}} {{17-18=with}} {{25-26=and}}
+  }
+}
+
+func I59843_f() {
+  I59843_A.configure(a: "a", b: "b") // expected-warning{{'configure(a:b:)' was deprecated in macOS 10.51: renamed to 'configure(with:)'}}
+  // expected-note@-1{{use 'configure(with:)' instead}} {{none}}
+  I59843_B.configure(a: "a", b: "b") // expected-warning{{'configure(a:b:)' was deprecated in macOS 10.51: renamed to 'configure(with:and:)'}}
+  // expected-note@-1{{use 'configure(with:and:)' instead}} {{22-23=with}} {{30-31=and}}
+  I59843_B.context(a: "a", b: "b") // expected-warning{{'context(a:b:)' was deprecated in macOS 10.51: replaced by 'I59843_B.context(with:and:)'}}
+  // expected-note@-1{{use 'I59843_B.context(with:and:)' instead}} {{20-21=with}} {{28-29=and}}
+  I59843_B.contextDiff(a: "a", b: "b") // expected-warning{{'contextDiff(a:b:)' was deprecated in macOS 10.51: replaced by 'I59843_A.contextDiff(with:and:)'}}
+  // expected-note@-1{{use 'I59843_A.contextDiff(with:and:)' instead}} {{3-23=I59843_A.contextDiff}} {{24-25=with}} {{32-33=and}}
+}