Merge pull request #11297 from benlangmuir/cc-generic-where-assoc-1

[code-completion] Partly fix completion of associatedtypes in where clauses

Author: benlangmuir

lib/Parse/ParseDecl.cpp

@@ -2526,7 +2526,15 @@ void Parser::parseDeclDelayed() {
   Scope S(this, DelayedState->takeScope());
   ContextChange CC(*this, DelayedState->ParentContext);
 
-  parseDecl(ParseDeclOptions(DelayedState->Flags), [](Decl *D) { });
+  parseDecl(ParseDeclOptions(DelayedState->Flags), [&](Decl *D) {
+    if (auto *parent = DelayedState->ParentContext) {
+      if (auto *NTD = dyn_cast<NominalTypeDecl>(parent)) {
+        NTD->addMember(D);
+      } else if (auto *ED = dyn_cast<ExtensionDecl>(parent)) {
+        ED->addMember(D);
+      }
+    }
+  });
 }
 
 /// \brief Parse an 'import' declaration, doing no token skipping on error.
@@ -3296,8 +3304,11 @@ ParserResult<TypeDecl> Parser::parseDeclAssociatedType(Parser::ParseDeclOptions
   if (Tok.is(tok::kw_where)) {
     auto whereStatus = parseProtocolOrAssociatedTypeWhereClause(
         TrailingWhere, /*isProtocol=*/false);
-    if (whereStatus.shouldStopParsing())
+    Status |= whereStatus;
+    if (whereStatus.hasCodeCompletion() && !CodeCompletion) {
+      // Trigger delayed parsing, no need to continue.
       return whereStatus;
+    }
   }
 
   if (!Flags.contains(PD_InProtocol)) {

test/IDE/complete_where_clause.swift

@@ -109,8 +109,12 @@ protocol P2 {
 
 // P2: Begin completions
 // P2-DAG: Decl[GenericTypeParam]/CurrNominal: Self[#Self#];
-// FIXME: Should complete T.
+// P2-DAG: Decl[AssociatedType]/CurrNominal:   T;
+// P2-DAG: Decl[AssociatedType]/CurrNominal:   U;
 // P2: End completions
 
+// U_DOT: Begin completions
 // FIXME: Should complete Q from Assoc.
-// U_DOT-NOT: Begin completions
+// U_DOT-DAG: Keyword/None:                       Type[#Self.U.Type#];
+// U_DOT-DAG: Keyword/CurrNominal:                self[#Self.U#];
+// U_DOT: End completions