[CodeComplete] Avoid distinguishing between closure types

This seems to be redundant now that we no longer
attempt to skip multi-statement closure bodies.

Author: hamishknight

include/swift/Sema/CompletionContextFinder.h

@@ -28,8 +28,7 @@ class CompletionContextFinder : public ASTWalker {
   enum class ContextKind {
     FallbackExpression,
     StringInterpolation,
-    SingleStmtClosure,
-    MultiStmtClosure,
+    Closure,
     ErrorExpression
   };
 
@@ -73,12 +72,6 @@ class CompletionContextFinder : public ASTWalker {
 
   PostWalkResult<Expr *> walkToExprPost(Expr *E) override;
 
-  /// Check whether code completion expression is located inside of a
-  /// multi-statement closure.
-  bool locatedInMultiStmtClosure() const {
-    return hasContext(ContextKind::MultiStmtClosure);
-  }
-
   bool locatedInStringInterpolation() const {
     return hasContext(ContextKind::StringInterpolation);
   }

lib/Sema/CompletionContextFinder.cpp

@@ -27,12 +27,8 @@ CompletionContextFinder::CompletionContextFinder(
 
 ASTWalker::PreWalkResult<Expr *>
 CompletionContextFinder::walkToExprPre(Expr *E) {
-  if (auto *closure = dyn_cast<ClosureExpr>(E)) {
-    Contexts.push_back({closure->hasSingleExpressionBody()
-                            ? ContextKind::SingleStmtClosure
-                            : ContextKind::MultiStmtClosure,
-                        closure});
-  }
+  if (auto *closure = dyn_cast<ClosureExpr>(E))
+    Contexts.push_back({ContextKind::Closure, closure});
 
   if (isa<InterpolatedStringLiteralExpr>(E)) {
     Contexts.push_back({ContextKind::StringInterpolation, E});
@@ -120,15 +116,12 @@ CompletionContextFinder::getFallbackCompletionExpr() const {
         fallback = Fallback{context.E, fallbackDC, separatePrecheck};
       continue;
 
-    case ContextKind::SingleStmtClosure:
+    case ContextKind::Closure:
       if (!fallback && context.E != InitialExpr)
         fallback = Fallback{context.E, fallbackDC, separatePrecheck};
       fallbackDC = cast<AbstractClosureExpr>(context.E);
       continue;
 
-    case ContextKind::MultiStmtClosure:
-      fallbackDC = cast<AbstractClosureExpr>(context.E);
-      LLVM_FALLTHROUGH;
     case ContextKind::ErrorExpression:;
       fallback = llvm::None;
       separatePrecheck = true;