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

[CodeCompletion] Annotated result type

Browse Source 
Introduced 'TypeAnnotationBegin' chunk kind for grouping the result type
name chunks.

rdar://problem/62617558
This commit is contained in:
Rintaro Ishizaki
2020-05-05 19:57:03 -07:00
parent bfde3b03a8
commit 7086ffb79f
14 changed files with 506 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp
View File

@@ -77,8 +77,7 @@ struct SwiftToSourceKitCompletionAdapter {
static void getResultSourceText(const CodeCompletionString *CCStr,
raw_ostream &OS);
static void getResultTypeName(const CodeCompletionString *CCStr,
raw_ostream &OS);
static void getResultAssociatedUSRs(ArrayRef<StringRef> AssocUSRs,
raw_ostream &OS);
};
@@ -212,8 +211,9 @@ void SwiftLangSupport::codeComplete(
SKConsumer, Result, CCOpts.annotatedDescription))
break;
}
SKConsumer.setReusingASTContext(info.completionContext->ReusingASTContext);
SKConsumer.setAnnotatedTypename(info.completionContext->getAnnnoateResult());
});
std::string Error;
@@ -473,7 +473,10 @@ bool SwiftToSourceKitCompletionAdapter::handleResult(
unsigned TypeBegin = SS.size();
{
llvm::raw_svector_ostream ccOS(SS);
getResultTypeName(Result->getCompletionString(), ccOS);
if (annotatedDescription)
ide::printCodeCompletionResultTypeNameAnnotated(*Result, ccOS);
else
ide::printCodeCompletionResultTypeName(*Result, ccOS);
}
unsigned TypeEnd = SS.size();
@@ -703,16 +706,13 @@ void SwiftToSourceKitCompletionAdapter::getResultSourceText(
--i;
continue;
}
if (!C.isAnnotation() && C.hasText()) {
OS << C.getText();
if (C.is(ChunkKind::TypeAnnotationBegin)) {
// Skip type annotation structure.
auto level = C.getNestingLevel();
do { ++i; } while (i != Chunks.size() && !Chunks[i].endsPreviousNestedGroup(level));
--i;
}
}
}
void SwiftToSourceKitCompletionAdapter::getResultTypeName(
const CodeCompletionString *CCStr, raw_ostream &OS) {
for (auto C : CCStr->getChunks()) {
if (C.getKind() == CodeCompletionString::Chunk::ChunkKind::TypeAnnotation) {
if (!C.isAnnotation() && C.hasText()) {
OS << C.getText();
}
}
@@ -1236,6 +1236,7 @@ void SwiftLangSupport::codeCompleteOpen(
typeContextKind = completionCtx.typeContextKind;
mayUseImplicitMemberExpr = completionCtx.MayUseImplicitMemberExpr;
consumer.setReusingASTContext(completionCtx.ReusingASTContext);
consumer.setAnnotatedTypename(completionCtx.getAnnnoateResult());
completions =
extendCompletions(results, sink, info, nameToPopularity, CCOpts);
});