---

yaml
---
r: 348723
b: refs/heads/master
c: 5dceb39
h: refs/heads/master
i:
  348721: dfb8581
  348719: 5b90746

Author: rintaro

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e7e45fd311607b896efeb4cddf0fa29f1ccde452
+refs/heads/master: 5dceb395f78d9703ecc54a329c2d5f75e91b7cd0
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Parse/ASTGen.cpp

@@ -756,13 +756,20 @@ TypeRepr *ASTGen::generate(const SILFunctionTypeSyntax &Type,
 TypeRepr *ASTGen::generate(const CodeCompletionTypeSyntax &Type,
                            const SourceLoc Loc) {
   auto base = Type.getBase();
-  if (!base)
+  if (!base) {
+    if (P.CodeCompletion)
+      P.CodeCompletion->completeTypeSimpleBeginning();
     return nullptr;
+  }
 
   if (P.CodeCompletion) {
-    TypeRepr *parsedTyR = generate(*base, Loc);
-    if (parsedTyR)
+    if (auto *parsedTyR = generate(*base, Loc)) {
       P.CodeCompletion->setParsedTypeLoc(parsedTyR);
+      if (Type.getPeriod())
+        P.CodeCompletion->completeTypeIdentifierWithDot();
+      else
+        P.CodeCompletion->completeTypeIdentifierWithoutDot();
+    }
   }
 
   // Return nullptr to typecheck this TypeRepr independently in code completion.
@@ -810,13 +817,28 @@ TypeRepr *ASTGen::generate(const UnknownTypeSyntax &Type, const SourceLoc Loc) {
   if (ChildrenCount >= 1) {
     auto LParen = Type.getChild(0)->getAs<TokenSyntax>();
     if (LParen && LParen->getTokenKind() == tok::l_paren) {
+      // generate child 'TypeSyntax' anyway to trigger the side effects e.g.
+      // code-completion.
+      for (size_t i = 1; i != ChildrenCount; ++i) {
+        auto elem = *Type.getChild(i);
+        if (auto ty = elem.getAs<TypeSyntax>())
+          (void)generate(*ty, Loc);
+      }
       auto LParenLoc = advanceLocBegin(Loc, *LParen);
       auto EndLoc =
           advanceLocBegin(Loc, *Type.getChild(Type.getNumChildren() - 1));
       return TupleTypeRepr::createEmpty(Context, {LParenLoc, EndLoc});
     }
   }
 
+  // generate child 'TypeSyntax' anyway to trigger the side effects e.g.
+  // code-completion.
+  for (size_t i = 0; i != ChildrenCount; ++i) {
+    auto elem = *Type.getChild(i);
+    if (auto ty = elem.getAs<TypeSyntax>())
+      (void)generate(*ty, Loc);
+  }
+
   // let's hope the main `generate` method can find this node in the type map
   return nullptr;
 }

trunk/lib/Parse/ParseType.cpp

@@ -183,9 +183,6 @@ Parser::parseTypeSimple(Diag<> MessageID, bool HandleCodeCompletion) {
   case tok::code_complete: {
     if (!HandleCodeCompletion)
       break;
-    if (CodeCompletion)
-      CodeCompletion->completeTypeSimpleBeginning();
-
     ParsedTypeSyntax ty = ParsedSyntaxRecorder::makeCodeCompletionType(
         None, None, consumeTokenSyntax(), *SyntaxContext);
     return makeParsedCodeCompletion(std::move(ty));
@@ -607,9 +604,6 @@ ParsedSyntaxResult<ParsedTypeSyntax> Parser::parseTypeIdentifier() {
       return parseAnyType();
 
     if (Tok.is(tok::code_complete)) {
-      if (CodeCompletion)
-        CodeCompletion->completeTypeSimpleBeginning();
-
       auto CCTok = consumeTokenSyntax(tok::code_complete);
       auto ty = ParsedSyntaxRecorder::makeCodeCompletionType(
           None, None, std::move(CCTok), *SyntaxContext);
@@ -700,9 +694,6 @@ ParsedSyntaxResult<ParsedTypeSyntax> Parser::parseTypeIdentifier() {
     assert(!genericArgs);
 
     if (Tok.is(tok::code_complete)) {
-      if (CodeCompletion)
-        CodeCompletion->completeTypeIdentifierWithDot();
-
       auto ty = ParsedSyntaxRecorder::makeCodeCompletionType(
           result.get(), std::move(period), consumeTokenSyntax(),
           *SyntaxContext);
@@ -717,9 +708,6 @@ ParsedSyntaxResult<ParsedTypeSyntax> Parser::parseTypeIdentifier() {
 
   if (result.isSuccess() && Tok.is(tok::code_complete) &&
       !Tok.isAtStartOfLine()) {
-    if (CodeCompletion)
-      CodeCompletion->completeTypeIdentifierWithoutDot();
-
     auto ty = ParsedSyntaxRecorder::makeCodeCompletionType(
         result.get(), None, consumeTokenSyntax(), *SyntaxContext);
     return makeParsedCodeCompletion(std::move(ty));