[CodeCompletion] Report 'Unrelated' type relation for keywords

Author: rintaro

lib/IDE/CodeCompletion.cpp

@@ -3613,8 +3613,13 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
     }
 
     // Fallback to showing the default type.
-    if (!defaultTypeName.empty())
+    if (!defaultTypeName.empty()) {
       builder.addTypeAnnotation(defaultTypeName);
+      builder.setExpectedTypeRelation(
+          expectedTypeContext.possibleTypes.empty()
+              ? CodeCompletionResult::ExpectedTypeRelation::Unknown
+              : CodeCompletionResult::ExpectedTypeRelation::Unrelated);
+    }
   }
 
   /// Add '#file', '#line', et at.

test/SourceKit/CodeComplete/complete_typerelation.swift

@@ -17,8 +17,78 @@ func testConvertibleContext() -> MyProto {
   return MyEnum.
 }
 
+func testBool() -> Bool {
+  return 
+}
+func testOptionalInt() -> Int? {
+  return 
+}
+func testVoid() -> Void {
+  return 
+}
+func testUnknown() {
+
+}
+
 // RUN: %sourcekitd-test -req=complete -pos=13:17 %s -- %s > %t.identical.response
 // RUN: diff -u %s.identical.response %t.identical.response
 
 // RUN: %sourcekitd-test -req=complete -pos=17:17 %s -- %s > %t.convertible.response
 // RUN: diff -u %s.convertible.response %t.convertible.response
+
+// RUN:  %sourcekitd-test -req=complete -pos=21:10 %s -- %s | %FileCheck %s --check-prefix=BOOLCONTEXT
+// RUN:  %sourcekitd-test -req=complete -pos=24:10 %s -- %s | %FileCheck %s --check-prefix=OPTIONALCONTEXT
+// RUN:  %sourcekitd-test -req=complete -pos=27:10 %s -- %s | %FileCheck %s --check-prefix=VOIDCONTEXT
+// RUN:  %sourcekitd-test -req=complete -pos=27:10 %s -- %s | %FileCheck %s --check-prefix=UNKNOWNCONTEXT
+
+// BOOLCONTEXT-LABEL: key.name: "false",
+// BOOLCONTEXT-NOT:   key.name:
+// BOOLCONTEXT:       key.typename: "Bool",
+// BOOLCONTEXT:       key.typerelation: source.codecompletion.typerelation.identical,
+// BOOLCONTEXT-LABEL: key.name: "nil",
+// BOOLCONTEXT-NOT:   key.name:
+// BOOLCONTEXT:       key.typename: "",
+// BOOLCONTEXT:       key.typerelation: source.codecompletion.typerelation.unknown,
+// BOOLCONTEXT-LABEL: key.name: "true",
+// BOOLCONTEXT-NOT:   key.name:
+// BOOLCONTEXT:       key.typename: "Bool",
+// BOOLCONTEXT:       key.typerelation: source.codecompletion.typerelation.identical,
+
+// OPTIONALCONTEXT-LABEL: key.name: "false",
+// OPTIONALCONTEXT-NOT:   key.name:
+// OPTIONALCONTEXT:       key.typename: "Bool",
+// OPTIONALCONTEXT:       key.typerelation: source.codecompletion.typerelation.unrelated,
+// OPTIONALCONTEXT-LABEL: key.name: "nil",
+// OPTIONALCONTEXT-NOT:   key.name:
+// OPTIONALCONTEXT:       key.typename: "Int?",
+// OPTIONALCONTEXT:       key.typerelation: source.codecompletion.typerelation.identical,
+// OPTIONALCONTEXT-LABEL: key.name: "true",
+// OPTIONALCONTEXT-NOT:   key.name:
+// OPTIONALCONTEXT:       key.typename: "Bool",
+// OPTIONALCONTEXT:       key.typerelation: source.codecompletion.typerelation.unrelated,
+
+// VOIDCONTEXT-LABEL: key.name: "false",
+// VOIDCONTEXT-NOT:   key.name:
+// VOIDCONTEXT:       key.typename: "Bool",
+// VOIDCONTEXT:       key.typerelation: source.codecompletion.typerelation.unrelated,
+// VOIDCONTEXT-LABEL: key.name: "nil",
+// VOIDCONTEXT-NOT:   key.name:
+// VOIDCONTEXT:       key.typename: "",
+// VOIDCONTEXT:       key.typerelation: source.codecompletion.typerelation.unrelated,
+// VOIDCONTEXT-LABEL: key.name: "true",
+// VOIDCONTEXT-NOT:   key.name:
+// VOIDCONTEXT:       key.typename: "Bool",
+// VOIDCONTEXT:       key.typerelation: source.codecompletion.typerelation.unrelated,
+
+// UNKNOWNCONTEXT-LABEL: key.name: "false",
+// UNKNOWNCONTEXT-NOT:   key.name:
+// UNKNOWNCONTEXT:       key.typename: "Bool",
+// UNKNOWNCONTEXT:       key.typerelation: source.codecompletion.typerelation.unknown,
+// UNKNOWNCONTEXT-LABEL: key.name: "nil",
+// UNKNOWNCONTEXT-NOT:   key.name:
+// UNKNOWNCONTEXT:       key.typename: "",
+// UNKNOWNCONTEXT:       key.typerelation: source.codecompletion.typerelation.unknown,
+// UNKNOWNCONTEXT-LABEL: key.name: "true",
+// UNKNOWNCONTEXT-NOT:   key.name:
+// UNKNOWNCONTEXT:       key.typename: "Bool",
+// UNKNOWNCONTEXT:       key.typerelation: source.codecompletion.typerelation.unknown,