[CodeCompletion] Ensure cached results have 'unknown' type relation

Author: rintaro

include/swift/IDE/CodeCompletion.h

@@ -585,7 +585,7 @@ class CodeCompletionResult {
   CodeCompletionResult(ResultKind Kind, SemanticContextKind SemanticContext,
                        unsigned NumBytesToErase,
                        CodeCompletionString *CompletionString,
-                       ExpectedTypeRelation TypeDistance = Unrelated,
+                       ExpectedTypeRelation TypeDistance,
                        CodeCompletionOperatorKind KnownOperatorKind =
                            CodeCompletionOperatorKind::None)
       : Kind(Kind), KnownOperatorKind(unsigned(KnownOperatorKind)),
@@ -610,7 +610,7 @@ class CodeCompletionResult {
                        SemanticContextKind SemanticContext,
                        unsigned NumBytesToErase,
                        CodeCompletionString *CompletionString,
-                       ExpectedTypeRelation TypeDistance = Unrelated)
+                       ExpectedTypeRelation TypeDistance)
       : Kind(Keyword), KnownOperatorKind(0),
         SemanticContext(unsigned(SemanticContext)), NotRecommended(false),
         NotRecReason(NotRecommendedReason::NoReason),
@@ -689,7 +689,7 @@ class CodeCompletionResult {
         AssociatedUSRs(AssociatedUSRs), DocWords(DocWords) {
     AssociatedKind = static_cast<unsigned>(DeclKind);
     assert(CompletionString);
-    TypeDistance = ExpectedTypeRelation::Unrelated;
+    TypeDistance = ExpectedTypeRelation::Unknown;
     assert(!isOperator() ||
            getOperatorKind() != CodeCompletionOperatorKind::None);
   }

lib/IDE/CodeCompletion.cpp

@@ -695,7 +695,7 @@ void CodeCompletionResult::print(raw_ostream &OS) const {
     Prefix.append(Twine(NumBytesToErase).str());
     Prefix.append("]");
   }
-  switch (ExpectedTypeRelation(TypeDistance)) {
+  switch (getExpectedTypeRelation()) {
     case ExpectedTypeRelation::Invalid:
       Prefix.append("/TypeRelation[Invalid]");
       break;

lib/IDE/CodeCompletionCache.cpp

@@ -255,7 +255,7 @@ static bool readCachedModule(llvm::MemoryBuffer *in,
     } else {
       result = new (*V.Sink.Allocator)
           CodeCompletionResult(kind, context, numBytesToErase, string,
-                               CodeCompletionResult::Unrelated, opKind);
+                               CodeCompletionResult::NotApplicable, opKind);
     }
 
     V.Sink.Results.push_back(result);

test/SourceKit/CodeComplete/complete_typerelation.swift

@@ -36,15 +36,20 @@ func testUnknown() {
 // 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
+// RUN: %empty-directory(%t/cache)
+// RUN: %sourcekitd-test -req=complete.cache.ondisk -cache-path %t/cache == -req=complete -pos=21:10 %s -- %s | %FileCheck %s --check-prefix=BOOLCONTEXT
+// RUN: %sourcekitd-test -req=complete.cache.ondisk -cache-path %t/cache == -req=complete -pos=24:10 %s -- %s | %FileCheck %s --check-prefix=OPTIONALCONTEXT
+// RUN: %sourcekitd-test -req=complete.cache.ondisk -cache-path %t/cache == -req=complete -pos=27:10 %s -- %s | %FileCheck %s --check-prefix=VOIDCONTEXT
+// RUN: %sourcekitd-test -req=complete.cache.ondisk -cache-path %t/cache == -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: "Int",
+// BOOLCONTEXT-NOT:   key.name:
+// BOOLCONTEXT:       key.typename: "Int",
+// BOOLCONTEXT:       key.typerelation: source.codecompletion.typerelation.unknown,
 // BOOLCONTEXT-LABEL: key.name: "nil",
 // BOOLCONTEXT-NOT:   key.name:
 // BOOLCONTEXT:       key.typename: "",
@@ -58,6 +63,10 @@ func testUnknown() {
 // OPTIONALCONTEXT-NOT:   key.name:
 // OPTIONALCONTEXT:       key.typename: "Bool",
 // OPTIONALCONTEXT:       key.typerelation: source.codecompletion.typerelation.unrelated,
+// OPTIONALCONTEXT-LABEL: key.name: "Int",
+// OPTIONALCONTEXT-NOT:   key.name:
+// OPTIONALCONTEXT:       key.typename: "Int",
+// OPTIONALCONTEXT:       key.typerelation: source.codecompletion.typerelation.unknown,
 // OPTIONALCONTEXT-LABEL: key.name: "nil",
 // OPTIONALCONTEXT-NOT:   key.name:
 // OPTIONALCONTEXT:       key.typename: "Int?",
@@ -71,6 +80,10 @@ func testUnknown() {
 // VOIDCONTEXT-NOT:   key.name:
 // VOIDCONTEXT:       key.typename: "Bool",
 // VOIDCONTEXT:       key.typerelation: source.codecompletion.typerelation.unrelated,
+// VOIDCONTEXT-LABEL: key.name: "Int",
+// VOIDCONTEXT-NOT:   key.name:
+// VOIDCONTEXT:       key.typename: "Int",
+// VOIDCONTEXT:       key.typerelation: source.codecompletion.typerelation.unknown,
 // VOIDCONTEXT-LABEL: key.name: "nil",
 // VOIDCONTEXT-NOT:   key.name:
 // VOIDCONTEXT:       key.typename: "",
@@ -84,6 +97,10 @@ func testUnknown() {
 // UNKNOWNCONTEXT-NOT:   key.name:
 // UNKNOWNCONTEXT:       key.typename: "Bool",
 // UNKNOWNCONTEXT:       key.typerelation: source.codecompletion.typerelation.unknown,
+// UNKNOWNCONTEXT-LABEL: key.name: "Int",
+// UNKNOWNCONTEXT-NOT:   key.name:
+// UNKNOWNCONTEXT:       key.typename: "Int",
+// UNKNOWNCONTEXT:       key.typerelation: source.codecompletion.typerelation.unknown,
 // UNKNOWNCONTEXT-LABEL: key.name: "nil",
 // UNKNOWNCONTEXT-NOT:   key.name:
 // UNKNOWNCONTEXT:       key.typename: "",

tools/SourceKit/lib/SwiftLang/CodeCompletionOrganizer.cpp

@@ -158,7 +158,8 @@ bool SourceKit::CodeCompletion::addCustomCompletions(
     CodeCompletion::SwiftResult swiftResult(
         CodeCompletion::SwiftResult::ResultKind::Pattern,
         SemanticContextKind::ExpressionSpecific,
-        /*NumBytesToErase=*/0, completionString);
+        /*NumBytesToErase=*/0, completionString,
+        CodeCompletionResult::ExpectedTypeRelation::Unknown);
 
     CompletionBuilder builder(sink, swiftResult);
     builder.setCustomKind(customCompletion.Kind);

tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp

@@ -992,7 +992,8 @@ static void transformAndForwardResults(
     CodeCompletion::SwiftResult paren(
         CodeCompletion::SwiftResult::ResultKind::BuiltinOperator,
         SemanticContextKind::ExpressionSpecific,
-        exactMatch ? exactMatch->getNumBytesToErase() : 0, completionString);
+        exactMatch ? exactMatch->getNumBytesToErase() : 0, completionString,
+        CodeCompletionResult::ExpectedTypeRelation::NotApplicable);
 
     SwiftCompletionInfo info;
     std::vector<Completion *> extended =