[IDE] Pass AssociatedDecl to CodeCompletionResult on creation

Author: a7medev

lib/IDE/CodeCompletionResultBuilder.cpp

@@ -171,8 +171,9 @@ CodeCompletionResult *CodeCompletionResultBuilder::takeResult() {
     // If the sink only intends to store the context free results in the cache,
     // we don't need to compute any contextual properties.
     return new (Allocator) CodeCompletionResult(
-        *ContextFreeResult, SemanticContextKind::None, CodeCompletionFlair(),
-        /*NumBytesToErase=*/0, CodeCompletionResultTypeRelation::Unrelated,
+        *ContextFreeResult, AssociatedDecl, /*HasValidAssociatedDecl=*/true,
+        SemanticContextKind::None, CodeCompletionFlair(), /*NumBytesToErase=*/0,
+        CodeCompletionResultTypeRelation::Unrelated,
         ContextualNotRecommendedReason::None);
   } else {
     assert(
@@ -191,8 +192,9 @@ CodeCompletionResult *CodeCompletionResultBuilder::takeResult() {
             ContextualNotRecReason, CanCurrDeclContextHandleAsync);
 
     return new (Allocator) CodeCompletionResult(
-        *ContextFreeResult, SemanticContext, Flair, NumBytesToErase,
-        typeRelation, notRecommendedReason);
+        *ContextFreeResult, AssociatedDecl, /*HasValidAssociatedDecl=*/true,
+        SemanticContext, Flair, NumBytesToErase, typeRelation,
+        notRecommendedReason);
   }
 }
 

tools/SourceKit/lib/SwiftLang/CodeCompletionOrganizer.cpp

@@ -140,9 +140,10 @@ bool SourceKit::CodeCompletion::addCustomCompletions(
             ContextFreeNotRecommendedReason::None,
             CodeCompletionDiagnosticSeverity::None, /*DiagnosticMessage=*/"");
     auto *swiftResult = new (sink.allocator) CodeCompletion::SwiftResult(
-        *contextFreeResult, SemanticContextKind::Local,
-        CodeCompletionFlairBit::ExpressionSpecific,
-        /*NumBytesToErase=*/0, CodeCompletionResultTypeRelation::Unrelated,
+        *contextFreeResult, /*AssociatedDecl=*/nullptr,
+        /*HasValidAssociatedDecl=*/true, SemanticContextKind::Local,
+        CodeCompletionFlairBit::ExpressionSpecific, /*NumBytesToErase=*/0,
+        CodeCompletionResultTypeRelation::Unrelated,
         ContextualNotRecommendedReason::None);
 
     CompletionBuilder builder(sink, *swiftResult);

tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp

@@ -916,7 +916,8 @@ static void transformAndForwardResults(
             CodeCompletionDiagnosticSeverity::None,
             /*DiagnosticMessage=*/"");
     auto *paren = new (innerSink.allocator) CodeCompletion::SwiftResult(
-        *contextFreeResult, SemanticContextKind::CurrentNominal,
+        *contextFreeResult, /*AssociatedDecl=*/nullptr,
+        /*HasValidAssociatedDecl=*/true, SemanticContextKind::CurrentNominal,
         CodeCompletionFlairBit::ExpressionSpecific,
         exactMatch ? exactMatch->getNumBytesToErase() : 0,
         CodeCompletionResultTypeRelation::Unrelated,