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

[CodeComplete] Suggested by Ben, deliver #available completion after # token and add placeholder to represent platform names.

Browse Source 
Swift SVN r32847
This commit is contained in:
Xi Ge
2015-10-23 19:49:57 +00:00
parent bfc9efa5ac
commit afe90ff3c2
7 changed files with 67 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/IDE/CodeCompletion.cpp
View File

@@ -931,6 +931,7 @@ public:
void completeAssignmentRHS(AssignExpr *E) override;
void completeCallArg(CallExpr *E) override;
void completeReturnStmt(CodeCompletionExpr *E) override;
void completeAfterPound(CodeCompletionExpr *E) override;
void addKeywords(CodeCompletionResultSink &Sink);
void doneParsing() override;
@@ -1628,6 +1629,17 @@ public:
Builder.addAnnotatedThrows();
}
void addPoundAvailable() {
CodeCompletionResultBuilder Builder(Sink, CodeCompletionResult::ResultKind::Keyword,
SemanticContextKind::ExpressionSpecific, ExpectedTypes);
Builder.addTextChunk("available");
Builder.addLeftParen();
Builder.addSystemParam("Platform", true);
Builder.addComma();
Builder.addTextChunk("*");
Builder.addRightParen();
}
void addFunctionCallPattern(const AnyFunctionType *AFT,
const AbstractFunctionDecl *AFD = nullptr) {
foundFunction(AFT);
@@ -3418,6 +3430,12 @@ void CodeCompletionCallbacksImpl::completeReturnStmt(CodeCompletionExpr *E) {
Kind = CompletionKind::ReturnStmtExpr;
}
void CodeCompletionCallbacksImpl::completeAfterPound(CodeCompletionExpr *E) {
CurDeclContext = P.CurDeclContext;
CodeCompleteTokenExpr = E;
Kind = CompletionKind::AfterPound;
}
void CodeCompletionCallbacksImpl::completeNominalMemberBeginning(
SmallVectorImpl<StringRef> &Keywords) {
assert(!InEnumElementRawValue);
@@ -3494,7 +3512,6 @@ static void addStmtKeywords(CodeCompletionResultSink &Sink) {
// Same: Swift.BooleanLiteralType.
AddKeyword("false", "Bool");
AddKeyword("true", "Bool");
AddKeyword("#available", "Bool");
AddKeyword("__DSO_HANDLE__", "UnsafeMutablePointer<Void>");
CodeCompletionResultBuilder Builder(Sink,
@@ -3516,6 +3533,7 @@ void CodeCompletionCallbacksImpl::addKeywords(CodeCompletionResultSink &Sink) {
case CompletionKind::AssignmentRHS:
case CompletionKind::CallArg:
case CompletionKind::ReturnStmtExpr:
case CompletionKind::AfterPound:
break;
case CompletionKind::PostfixExprBeginning:
@@ -4000,6 +4018,12 @@ void CodeCompletionCallbacksImpl::doneParsing() {
}
}
Lookup.getValueCompletionsInDeclContext(Loc);
break;
}
case CompletionKind::AfterPound: {
Lookup.addPoundAvailable();
break;
}
}