Merge pull request #9710 from huonw/where-completion-crash

[4.0] [Parse] Don't tell CodeCompletion nonsense about protocol/AT where clauses

Author: huonw

lib/Parse/ParseDecl.cpp

@@ -5357,8 +5357,6 @@ parseDeclProtocol(ParseDeclOptions Flags, DeclAttributes &Attributes) {
     Status |= parseInheritance(InheritedProtocols, &classRequirementLoc);
   }
 
-  // Parse a 'where' clause if present. These are not supported, but we will
-  // get better QoI this way.
   TrailingWhereClause *TrailingWhere = nullptr;
   // Parse a 'where' clause if present.
   if (Tok.is(tok::kw_where)) {

lib/Parse/ParseGeneric.cpp

@@ -390,12 +390,7 @@ ParserStatus Parser::parseProtocolOrAssociatedTypeWhereClause(
     trailingWhere =
         TrailingWhereClause::create(Context, whereLoc, requirements);
   } else if (whereStatus.hasCodeCompletion()) {
-    // FIXME: this is completely (hah) cargo culted.
-    if (CodeCompletion && firstTypeInComplete) {
-      CodeCompletion->completeGenericParams(nullptr);
-    } else {
-      return makeParserCodeCompletionStatus();
-    }
+    return whereStatus;
   }
 
   return ParserStatus();

test/IDE/complete_crashes.swift

@@ -196,3 +196,9 @@ struct S_RDAR_28991372 {
 
 S_RDAR_28991372(x: #^RDAR_28991372^#, y: <#T##Int#>)
 // RDAR_28991372: Begin completions
+
+// rdar://problem/31981486
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=RDAR_31981486 | %FileCheck %s -check-prefix=RDAR_31981486
+
+protocol P where #^RDAR_31981486^#
+// RDAR_31981486: Begin completions

validation-test/IDE/crashers_2/0012-protocol-where-clause.swift

@@ -0,0 +1,4 @@
+// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s
+// REQUIRES: asserts
+
+protocol a where #^A^#