[SE-0095] [Code completion] for the Any type keyword

Now that Any isn’t in the stdlib we need to add it to code completion
separately.

Author: joewillsher

lib/IDE/CodeCompletion.cpp

@@ -4648,6 +4648,15 @@ static void addExprKeywords(CodeCompletionResultSink &Sink) {
   AddKeyword("#dsohandle", "UnsafeMutablePointer<Void>", CodeCompletionKeywordKind::pound_dsohandle);
 }
 
+static void addAnyTypeKeyword(CodeCompletionResultSink &Sink) {
+  CodeCompletionResultBuilder Builder(
+      Sink, CodeCompletionResult::ResultKind::Keyword,
+      SemanticContextKind::None, {});
+  // pretend 'Any' is from another module
+  Builder.setKeywordKind(CodeCompletionKeywordKind::None);
+  Builder.addTextChunk("Any");
+}
+
 
 void CodeCompletionCallbacksImpl::addKeywords(CodeCompletionResultSink &Sink,
                                               bool MaybeFuncBody) {
@@ -4676,19 +4685,23 @@ void CodeCompletionCallbacksImpl::addKeywords(CodeCompletionResultSink &Sink,
     addSuperKeyword(Sink);
     addLetVarKeywords(Sink);
     addExprKeywords(Sink);
+    addAnyTypeKeyword(Sink);
     break;
 
   case CompletionKind::PostfixExpr:
   case CompletionKind::PostfixExprParen:
   case CompletionKind::SuperExpr:
   case CompletionKind::SuperExprDot:
-  case CompletionKind::TypeSimpleBeginning:
-  case CompletionKind::TypeIdentifierWithDot:
-  case CompletionKind::TypeIdentifierWithoutDot:
   case CompletionKind::CaseStmtBeginning:
   case CompletionKind::CaseStmtDotPrefix:
+  case CompletionKind::TypeIdentifierWithDot:
+  case CompletionKind::TypeIdentifierWithoutDot:
     break;
 
+  case CompletionKind::TypeSimpleBeginning:
+    addAnyTypeKeyword(Sink);
+    break;
+      
   case CompletionKind::NominalMemberBeginning:
     addDeclKeywords(Sink);
     addLetVarKeywords(Sink);

test/IDE/complete_type_any.swift

@@ -0,0 +1,44 @@
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ANY_IN_FUNC_PARAM > %t.types.txt
+// RUN: FileCheck %s -check-prefix=ANY_IN_FUNC_PARAM < %t.types.txt
+
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ANY_IN_VAR_TYPE > %t.types.txt
+// RUN: FileCheck %s -check-prefix=ANY_IN_VAR_TYPE < %t.types.txt
+
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ANY_METATYPE_VARIABLE > %t.types.txt
+// RUN: FileCheck %s -check-prefix=ANY_METATYPE_VARIABLE < %t.types.txt
+
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ANY_METATYPE_MEMBER > %t.types.txt
+// RUN: FileCheck %s -check-prefix=ANY_METATYPE_MEMBER < %t.types.txt
+
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ANY_IN_TYPEALIAS > %t.types.txt
+// RUN: FileCheck %s -check-prefix=ANY_IN_TYPEALIAS < %t.types.txt
+
+
+func testAnyInParamList(a: #^ANY_IN_FUNC_PARAM^#
+// ANY_IN_FUNC_PARAM: Begin completions
+// ANY_IN_FUNC_PARAM-DAG: Keyword/None: Any; name=Any
+// ANY_IN_FUNC_PARAM: End completions
+
+func scope() {
+  var a: #^ANY_IN_VAR_TYPE^#
+  // ANY_IN_VAR_TYPE: Begin completions
+  // ANY_IN_VAR_TYPE-DAG: Keyword/None: Any; name=Any
+  // ANY_IN_VAR_TYPE: End completions
+}
+
+let _: Any.Type = #^ANY_METATYPE_VARIABLE^#
+// ANY_METATYPE_VARIABLE: Begin completions
+// ANY_METATYPE_VARIABLE-DAG: Keyword/None: Any; name=Any
+// ANY_METATYPE_VARIABLE: End completions
+
+_ = Int.#^ANY_METATYPE_MEMBER^#
+// ANY_METATYPE_MEMBER: Begin completions
+// ANY_METATYPE_MEMBER-NOT: Any
+// ANY_METATYPE_MEMBER: End completions
+
+typealias A = #^ANY_IN_TYPEALIAS^#
+// ANY_IN_TYPEALIAS: Begin completions
+// ANY_IN_TYPEALIAS-DAG: Keyword/None: Any; name=Any
+// ANY_IN_TYPEALIAS: End completions
+
+