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

[CodeCompletion] Use 'Flair' to describe "is argument labels"

Browse Source
This commit is contained in:
Rintaro Ishizaki
2021-05-21 00:13:56 -07:00
parent 6dd5d9482f
commit 154cd88c86
36 changed files with 340 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,7 +155,7 @@ bool SourceKit::CodeCompletion::addCustomCompletions(
CodeCompletion::SwiftResult swiftResult(
CodeCompletion::SwiftResult::ResultKind::Pattern,
SemanticContextKind::Local, CodeCompletionFlairBit::ExpressionSpecific,
/*IsArgumentLabels=*/false, /*NumBytesToErase=*/0, completionString,
/*NumBytesToErase=*/0, completionString,
CodeCompletionResult::ExpectedTypeRelation::Unknown);
CompletionBuilder builder(sink, swiftResult);
@@ -660,13 +660,11 @@ static ResultBucket getResultBucket(Item &item, bool hasRequiredTypes,
if (!skipMetaGroups) {
auto flair = completion->getFlair();
if (flair.contains(CodeCompletionFlairBit::ExpressionSpecific) ||
flair.contains(CodeCompletionFlairBit::SuperChain))
flair.contains(CodeCompletionFlairBit::SuperChain) ||
flair.contains(CodeCompletionFlairBit::ArgumentLabels))
return ResultBucket::ExpressionSpecific;
}
if (completion->isArgumentLabels() && !skipMetaGroups)
return ResultBucket::ExpressionSpecific;
if (completion->isOperator())
return ResultBucket::Operator;
@@ -1169,15 +1167,13 @@ Completion *CompletionBuilder::finish() {
if (current.getKind() == SwiftResult::Declaration) {
base = SwiftResult(
semanticContext, flair, current.isArgumentLabels(),
current.getNumBytesToErase(), completionString,
semanticContext, flair, current.getNumBytesToErase(), completionString,
current.getAssociatedDeclKind(), current.isSystem(),
current.getModuleName(), current.getNotRecommendedReason(),
current.getBriefDocComment(), current.getAssociatedUSRs(),
current.getDeclKeywords(), typeRelation, opKind);
} else {
base = SwiftResult(current.getKind(), semanticContext, flair,
current.isArgumentLabels(),
current.getNumBytesToErase(), completionString,
typeRelation, opKind);
}