[CodeCompletion] Don't look through non-type contexts in override

We don't actually want to skip non-type contexts here, since we should
only be showing override completions in the type context itself. This
was pretty obscure to hit in practice, but I noticed it while fixing the
crasher.

Author: benlangmuir

lib/IDE/CodeCompletion.cpp

@@ -3728,11 +3728,9 @@ class CompletionOverrideLookup : public swift::VisibleDeclConsumer {
       NameOffset = Printer.NameOffset.getValue();
     }
 
-    auto typeContext = CurrDeclContext->getInnermostTypeContext();
-    assert(typeContext &&
-           typeContext->getAsGenericTypeOrGenericTypeExtensionContext());
+    assert(CurrDeclContext->getAsGenericTypeOrGenericTypeExtensionContext());
     Accessibility AccessibilityOfContext =
-        typeContext->getAsGenericTypeOrGenericTypeExtensionContext()
+        CurrDeclContext->getAsGenericTypeOrGenericTypeExtensionContext()
             ->getFormalAccess();
 
     bool missingDeclIntroducer = !hasVarIntroducer && !hasFuncIntroducer;
@@ -3865,15 +3863,13 @@ class CompletionOverrideLookup : public swift::VisibleDeclConsumer {
   }
 
   void getOverrideCompletions(SourceLoc Loc) {
-    if (auto TypeContext = CurrDeclContext->getInnermostTypeContext()){
-      if (!TypeContext->getAsGenericTypeOrGenericTypeExtensionContext())
-        return;
+    if (!CurrDeclContext->getAsGenericTypeOrGenericTypeExtensionContext())
+      return;
 
-      if (Type CurrTy = TypeContext->getDeclaredTypeInContext()) {
-        lookupVisibleMemberDecls(*this, CurrTy, CurrDeclContext,
-                                 TypeResolver.get());
-        addDesignatedInitializers(CurrTy);
-      }
+    if (Type CurrTy = CurrDeclContext->getDeclaredTypeInContext()) {
+      lookupVisibleMemberDecls(*this, CurrTy, CurrDeclContext,
+                               TypeResolver.get());
+      addDesignatedInitializers(CurrTy);
     }
   }
 };

test/IDE/complete_override.swift

@@ -82,6 +82,7 @@
 // RUN: FileCheck %s -check-prefix=NESTED_NOMINAL < %t.txt
 
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_CLOSURE_1 -code-completion-keywords=false | FileCheck %s -check-prefix=NESTED_CLOSURE_1
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=NESTED_CLOSURE_2 -code-completion-keywords=false | FileCheck %s -check-prefix=NESTED_CLOSURE_2
 
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OMIT_KEYWORD1 -code-completion-keywords=false > %t.txt
 // RUN: FileCheck %s -check-prefix=OMIT_KEYWORD1< %t.txt
@@ -364,6 +365,12 @@ class OuterNominal2: ProtocolA {
 // NESTED_CLOSURE_1-NOT: Decl{{.*}}/Super
 // NESTED_CLOSURE_1-NOT: {|}
 
+class OuterNominal3: ProtocolA {
+  var f = { static #^NESTED_CLOSURE_2^# }()
+}
+// NESTED_CLOSURE_2-NOT: Decl{{.*}}/Super
+// NESTED_CLOSURE_2-NOT: {|}
+
 class OmitKW1 : ProtocolA {
   override#^OMIT_KEYWORD1^#
 }

validation-test/IDE/crashers_fixed/009-swift-performdelayedparsing.swift

@@ -2,4 +2,4 @@
 enum b:a{var f={static#^A^#
 // FIXME: we shouldn't back the parser to the beginning of the line, it leads
 // to ridiculous override completions like this.
-// CHECK: Decl[InstanceVar]/Super:            var rawValue: Self.RawValue;
+// CHECK-NOT: Decl{{.*}}/Super