Merge pull request #70010 from ahoppen/ahoppen/prefer-call-if-reference-and-call-are-possible

[CodeComplete] Prefer function call if both reference and call are possible

Author: ahoppen

lib/IDE/CompletionLookup.cpp

@@ -1972,10 +1972,11 @@ bool CompletionLookup::addCompoundFunctionNameIfDesiable(
   if (!useFunctionReference && funcTy) {
     // We know that the CodeCompletionResultType is AST-based so we can pass
     // nullptr for USRTypeContext.
-    auto maxRel = CodeCompletionResultType(funcTy).calculateTypeRelation(
+    auto maxFuncTyRel = CodeCompletionResultType(funcTy).calculateTypeRelation(
         &expectedTypeContext, CurrDeclContext, /*USRTypeContext=*/nullptr);
-    useFunctionReference =
-        maxRel >= CodeCompletionResultTypeRelation::Convertible;
+    auto maxResultTyRel = CodeCompletionResultType(funcTy->getResult()).calculateTypeRelation(
+        &expectedTypeContext, CurrDeclContext, /*USRTypeContext=*/nullptr);
+    useFunctionReference = maxFuncTyRel > maxResultTyRel;
   }
   if (!useFunctionReference)
     return false;

test/IDE/complete_prefer_function_call_if_both_reference_and_call_are_possible.swift

@@ -0,0 +1,43 @@
+// RUN: %batch-code-completion
+
+struct Route {
+  func makeDetailView() -> Int {
+    return 52
+  }
+}
+
+@resultBuilder struct ViewBuilder {
+    static func buildBlock(_ x: Int) -> Int { return x }
+}
+
+func foo(@ViewBuilder destination: () -> Int) {}
+func foo(destination: Int) {}
+
+func test(route: Route?) {
+  route.map { route in
+    foo(destination: route.#^COMPLETE^#)
+  }
+}
+
+
+// COMPLETE-DAG: Keyword[self]/CurrNominal:          self[#Route#];
+// COMPLETE-DAG: Decl[InstanceMethod]/CurrNominal/TypeRelation[Convertible]: makeDetailView()[#Int#];
+
+func testTask(route: Route) {
+  Task {
+    route.#^IN_TASK?check=COMPLETE^#
+  }
+}
+
+protocol Builder {
+  func recv<T>(_: (T) throws -> Void)
+}
+
+struct S {
+  func foo(x: Int) throws {}
+  func test(builder: Builder) {
+    builder.recv(#^IN_CONTEXT_FOR_UNAPPLIED_REF^#)
+  }
+}
+// IN_CONTEXT_FOR_UNAPPLIED_REF-DAG: Decl[InstanceMethod]/CurrNominal/TypeRelation[Convertible]: foo(x:)[#(Int) throws -> ()#]; name=foo(x:)
+// IN_CONTEXT_FOR_UNAPPLIED_REF-DAG: Decl[InstanceMethod]/CurrNominal/TypeRelation[Convertible]: test(builder:)[#(any Builder) -> ()#]; name=test(builder:)