---

yaml
---
r: 349601
b: refs/heads/master-next
c: d5cabc3
h: refs/heads/master
i:
  349599: 56192a2

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 182c0ccd6ba126777577f0f5e7cf5aa86472eb03
+refs/heads/master-next: d5cabc36ad6d0d948211726e0359f9d143b8dd65
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/Parse/ParseType.cpp

@@ -209,11 +209,9 @@ Parser::TypeResult Parser::parseTypeSimple(Diag<> MessageID,
   }
 
   // '.Type', '.Protocol', '?', '!', and '[]' still leave us with type-simple.
-  while (Result->isSuccess() || !Result->getUnknownNodes().empty()) {
-    auto PrevType = Result->isSuccess()
-                        ? Result->getResult()
-                        : ParsedSyntaxRecorder::makeUnknownType(
-                              Result->getUnknownNodes(), *SyntaxContext);
+  while (Result->isSuccess()) {
+    auto PrevType = Result->getResult();
+
     if ((Tok.is(tok::period) || Tok.is(tok::period_prefix)) &&
         (peekToken().isContextualKeyword("Type") ||
          peekToken().isContextualKeyword("Protocol"))) {
@@ -236,9 +234,6 @@ Parser::TypeResult Parser::parseTypeSimple(Diag<> MessageID,
         continue;
       }
     }
-    if (!Result->isSuccess())
-      Result =
-          makeParsedResult<ParsedTypeSyntax>({PrevType}, Result->getStatus());
     break;
   }
 

branches/master-next/test/IDE/complete_type.swift

@@ -400,6 +400,8 @@
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNBOUND_DOT | %FileCheck %s -check-prefix=UNBOUND_DOT
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNBOUND_DOT_2 | %FileCheck %s -check-prefix=UNBOUND_DOT_2
 
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERICARG_OPTIONAL | %FileCheck %s -check-prefix=GENERICARG_OPTIONAL
+
 //===--- Helper types that are used in this test
 
 struct FooStruct {
@@ -1129,3 +1131,6 @@ func testUnbound2(x: OuterStruct<Int>.Inner.#^UNBOUND_DOT_2^#) {}
 // UNBOUND_DOT_2: Begin completions
 // UNBOUND_DOT_2-DAG: Keyword/None:                       Type[#OuterStruct<Int>.Inner.Type#]; name=Type
 // UNBOUND_DOT_2: End completions
+
+func testGenericArgForOptional() -> Set<#^GENERICARG_OPTIONAL^#>? {}
+// GENERICARG_OPTIONAL: Begin completions