[IDE] Don't rank based on overload choices of function calls that contain the code completion token

Author: ahoppen

lib/Sema/CSRanking.cpp

@@ -956,6 +956,25 @@ SolutionCompareResult ConstraintSystem::compareSolutions(
     // FIXME: Along with the FIXME below, this is a hack to work around
     // problems with restating requirements in protocols.
     identical = false;
+
+    if (cs.Context.CompletionCallback) {
+      // Don't rank based on overload choices of function calls that contain the
+      // code completion token.
+      ASTNode anchor = simplifyLocatorToAnchor(overload.locator);
+      if (auto expr = getAsExpr(anchor)) {
+        // If the anchor is a called function, also don't rank overload choices
+        // if any of the arguments contain the code completion token.
+        if (auto apply = dyn_cast_or_null<ApplyExpr>(cs.getParentExpr(expr))) {
+          if (apply->getFn() == expr) {
+            anchor = apply;
+          }
+        }
+      }
+      if (anchor && cs.containsIDEInspectionTarget(anchor)) {
+        continue;
+      }
+    }
+
     bool decl1InSubprotocol = false;
     bool decl2InSubprotocol = false;
     if (dc1->getContextKind() == DeclContextKind::GenericTypeDecl &&

test/IDE/complete_ambiguous.swift

@@ -443,8 +443,8 @@ struct Struct123: Equatable {
 }
 func testBestSolutionFilter() {
   let a = Struct123();
-  let b = [Struct123]().first(where: { $0 == a && 1 + 90 * 5 / 8 == 45 * -10 })?.structMem != .#^BEST_SOLUTION_FILTER?xfail=rdar73282163^#
-  let c = min(10.3, 10 / 10.4) < 6 / 7 ? true : Optional(a)?.structMem != .#^BEST_SOLUTION_FILTER2?check=BEST_SOLUTION_FILTER;xfail=rdar73282163^#
+  let b = [Struct123]().first(where: { $0 == a && 1 + 90 * 5 / 8 == 45 * -10 })?.structMem != .#^BEST_SOLUTION_FILTER^#
+  let c = min(10.3, 10 / 10.4) < 6 / 7 ? true : Optional(a)?.structMem != .#^BEST_SOLUTION_FILTER2?check=BEST_SOLUTION_FILTER^#
 }
 
 // BEST_SOLUTION_FILTER-DAG: Decl[EnumElement]/CurrNominal/Flair[ExprSpecific]/TypeRelation[Convertible]: enumElem[#Enum123#]{{; name=.+$}}

test/IDE/complete_in_closures.swift

@@ -485,3 +485,16 @@ func testReferenceToVariableDefinedInClosure() {
   // VARIABLE_DEFINED_IN_CLOSURE: Decl[LocalVar]/Local:               item[#String#]; name=item
 }
 
+func testBinaryOperatorWithEnum() {
+  func closureWithEnum(completionHandler: (SomeEnum) -> Void) {}
+
+  closureWithEnum { foo in
+    if foo != .#^BINARY_OPERATOR_WITH_ENUM^# {
+    }
+  }
+// BINARY_OPERATOR_WITH_ENUM: Begin completions
+// BINARY_OPERATOR_WITH_ENUM-DAG: Decl[EnumElement]/CurrNominal/Flair[ExprSpecific]/TypeRelation[Convertible]: north[#SomeEnum#]
+// BINARY_OPERATOR_WITH_ENUM-DAG: Decl[EnumElement]/CurrNominal/Flair[ExprSpecific]/TypeRelation[Convertible]: south[#SomeEnum#]
+// BINARY_OPERATOR_WITH_ENUM: End completions
+
+}