Merge pull request #33270 from rintaro/ide-completion-typecheckcontextat

[CodeCompletion] Cleanup typeCheckContextAt()

Author: rintaro

lib/IDE/ExprContextAnalysis.cpp

@@ -42,11 +42,9 @@ using namespace ide;
 // typeCheckContextAt(DeclContext, SourceLoc)
 //===----------------------------------------------------------------------===//
 
-namespace {
-void typeCheckContextImpl(DeclContext *DC, SourceLoc Loc) {
-  // Nothing to type check in module context.
-  if (DC->isModuleScopeContext())
-    return;
+void swift::ide::typeCheckContextAt(DeclContext *DC, SourceLoc Loc) {
+  while (isa<AbstractClosureExpr>(DC))
+    DC = DC->getParent();
 
   // Make sure the extension has been bound, in case it is in an inactive #if
   // or something weird like that.
@@ -67,6 +65,7 @@ void typeCheckContextImpl(DeclContext *DC, SourceLoc Loc) {
   switch (DC->getContextKind()) {
   case DeclContextKind::AbstractClosureExpr:
   case DeclContextKind::Module:
+  case DeclContextKind::FileUnit:
   case DeclContextKind::SerializedLocal:
   case DeclContextKind::EnumElementDecl:
   case DeclContextKind::GenericTypeDecl:
@@ -105,19 +104,8 @@ void typeCheckContextImpl(DeclContext *DC, SourceLoc Loc) {
     }
     break;
   }
-
-  case DeclContextKind::FileUnit:
-    llvm_unreachable("module scope context handled above");
   }
 }
-} // anonymous namespace
-
-void swift::ide::typeCheckContextAt(DeclContext *DC, SourceLoc Loc) {
-  while (isa<AbstractClosureExpr>(DC))
-    DC = DC->getParent();
-
-  typeCheckContextImpl(DC, Loc);
-}
 
 //===----------------------------------------------------------------------===//
 // findParsedExpr(DeclContext, Expr)