[IDE] Remove special handling for multi-statement closures

Author: ahoppen

lib/Sema/TypeCheckCodeCompletion.cpp

@@ -631,23 +631,6 @@ bool TypeChecker::typeCheckForCodeCompletion(
     if (solutions.empty())
       return CompletionResult::Fallback;
 
-    // If code completion expression resides inside of multi-statement
-    // closure body it could either be type-checked together with the context
-    // or not, it's impossible to say without checking.
-    if (contextAnalyzer.locatedInMultiStmtClosure()) {
-      if (!hasTypeForCompletion(solutions.front(), contextAnalyzer)) {
-        // At this point we know the code completion node wasn't checked with
-        // the closure's surrounding context, so can defer to regular
-        // type-checking for the current call to typeCheckExpression. If that
-        // succeeds we will get a second call to typeCheckExpression for the
-        // body of the closure later and can gather completions then. If it
-        // doesn't we rely on the fallback typechecking in the subclasses of
-        // TypeCheckCompletionCallback that considers in isolation a
-        // sub-expression of the closure that contains the completion location.
-        return CompletionResult::NotApplicable;
-      }
-    }
-
     // FIXME: instead of filtering, expose the score and viability to clients.
     // Remove solutions that skipped over/ignored the code completion point
     // or that require fixes and have a score that is worse than the best.

test/IDE/complete_call_arg.swift

@@ -469,7 +469,7 @@ func curry<T1, T2, R>(_ f: @escaping (T1, T2) -> R) -> (T1) -> (T2) -> R {
   // NESTED_CLOSURE: Begin completions
   // FIXME: Should be '/TypeRelation[Invalid]: t2[#T2#]'
   // NESTED_CLOSURE: Decl[LocalVar]/Local:               t2; name=t2
-  // NESTED_CLOSURE: Decl[LocalVar]/Local:               t1[#T1#]; name=t1
+  // NESTED_CLOSURE: Decl[LocalVar]/Local:               t1; name=t1
 }
 
 func trailingClosureLocal(x: Int, fn: (Int) -> Void) {