averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Code Completion] Split code completion results into context free part that can be cached and contextual part displayed to the user

Browse Source 
This allows makes the distinction between cachable and non-cachable properties cleaner and allows us to more easily compute contextual information (like type relations) for cached items later.
This commit is contained in:
Alex Hoppen
2022-01-14 16:26:32 +01:00
parent bad96793f8
commit fd72674a57
11 changed files with 693 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
tools/SourceKit/lib/SwiftLang/CodeCompletionOrganizer.cpp
View File

@@ -154,11 +154,19 @@ bool SourceKit::CodeCompletion::addCustomCompletions(
auto chunk = Chunk::createWithText(Chunk::ChunkKind::Text, 0, nameCopy);
auto *completionString =
CodeCompletionString::create(sink.allocator, chunk);
auto *contextFreeResult =
new (sink.allocator) ContextFreeCodeCompletionResult(
CodeCompletionResultKind::Pattern, completionString,
CodeCompletionOperatorKind::None, /*BriefDocComment=*/"",
ContextFreeNotRecommendedReason::None,
CodeCompletionDiagnosticSeverity::None, /*DiagnosticMessage=*/"");
auto *swiftResult = new (sink.allocator) CodeCompletion::SwiftResult(
CodeCompletionResultKind::Pattern, SemanticContextKind::Local,
*contextFreeResult, SemanticContextKind::Local,
CodeCompletionFlairBit::ExpressionSpecific,
/*NumBytesToErase=*/0, completionString,
CodeCompletionResult::ExpectedTypeRelation::Unknown);
/*NumBytesToErase=*/0,
CodeCompletionResult::ExpectedTypeRelation::Unknown,
ContextualNotRecommendedReason::None,
CodeCompletionDiagnosticSeverity::None, /*DiagnosticMessage=*/"");
CompletionBuilder builder(sink, *swiftResult);
builder.setCustomKind(customCompletion.Kind);
@@ -1176,18 +1184,26 @@ Completion *CompletionBuilder::finish() {
if (base.isOperator())
opKind = base.getOperatorKind();
if (base.getKind() == CodeCompletionResultKind::Declaration) {
newBase = new (sink.allocator) SwiftResult(
semanticContext, flair, base.getNumBytesToErase(), completionString,
base.getAssociatedDeclKind(), base.isSystem(), base.getModuleName(),
base.getNotRecommendedReason(), base.getDiagnosticSeverity(),
base.getDiagnosticMessage(), base.getBriefDocComment(),
base.getAssociatedUSRs(), typeRelation, opKind);
} else {
newBase = new (sink.allocator) SwiftResult(
base.getKind(), semanticContext, flair, base.getNumBytesToErase(),
completionString, typeRelation, opKind);
}
const ContextFreeCodeCompletionResult &contextFreeBase =
base.getContextFreeResult();
ContextFreeCodeCompletionResult *contextFreeResult =
new (sink.allocator) ContextFreeCodeCompletionResult(
contextFreeBase.getKind(),
contextFreeBase.getOpaqueAssociatedKind(), opKind,
contextFreeBase.isSystem(), completionString,
contextFreeBase.getModuleName(),
contextFreeBase.getBriefDocComment(),
contextFreeBase.getAssociatedUSRs(),
contextFreeBase.getNotRecommendedReason(),
contextFreeBase.getDiagnosticSeverity(),
contextFreeBase.getDiagnosticMessage());
newBase = new (sink.allocator) SwiftResult(
*contextFreeResult, semanticContext, flair, base.getNumBytesToErase(),
typeRelation, base.getContextualNotRecommendedReason(),
base.getContextualDiagnosticSeverity(),
base.getContextualDiagnosticMessage());
llvm::raw_svector_ostream OSS(nameStorage);
ide::printCodeCompletionResultFilterName(*newBase, OSS);