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] Add several more literal completions

Browse Source 
Go beyond the existing keyword completions to include more literal
suggestions: 0, 0.0, "text", [item], [key: value], (item, item)

For rdar://problem/21923069

Swift SVN r32890
This commit is contained in:
Ben Langmuir
2015-10-26 20:41:56 +00:00
parent ba7db29113
commit 7fda8964db
4 changed files with 186 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/IDE/CodeCompletion.cpp
View File

@@ -1653,7 +1653,7 @@ public:
SemanticContextKind::ExpressionSpecific, ExpectedTypes);
Builder.addTextChunk("available");
Builder.addLeftParen();
Builder.addSystemParam("Platform", true);
Builder.addSimpleTypedParameter("Platform", /*isVarArg=*/true);
Builder.addComma();
Builder.addTextChunk("*");
Builder.addRightParen();
@@ -2682,6 +2682,13 @@ public:
using KPK = KnownProtocolKind;
using Builder = CodeCompletionResultBuilder;
// Add literal completions that conform to specific protocols.
addFromProto(KPK::IntegerLiteralConvertible, "Int", [](Builder &builder) {
builder.addTextChunk("0");
});
addFromProto(KPK::FloatLiteralConvertible, "Double", [](Builder &builder) {
builder.addTextChunk("0.0");
});
addFromProto(KPK::BooleanLiteralConvertible, "Bool", [](Builder &builder) {
builder.addTextChunk("true");
}, /*isKeyword=*/true);
@@ -2691,6 +2698,43 @@ public:
addFromProto(KPK::NilLiteralConvertible, "", [](Builder &builder) {
builder.addTextChunk("nil");
}, /*isKeyword=*/true);
addFromProto(KPK::StringLiteralConvertible, "String", [&](Builder &builder) {
builder.addTextChunk("\"");
builder.addSimpleNamedParameter("text");
builder.addTextChunk("\"");
});
addFromProto(KPK::ArrayLiteralConvertible, "Array", [&](Builder &builder) {
builder.addLeftBracket();
builder.addSimpleNamedParameter("item");
builder.addRightBracket();
});
addFromProto(KPK::DictionaryLiteralConvertible, "Dictionary", [&](Builder &builder) {
builder.addLeftBracket();
builder.addSimpleNamedParameter("key");
builder.addTextChunk(": ");
builder.addSimpleNamedParameter("value");
builder.addRightBracket();
});
// Add tuple completion (item, item).
{
CodeCompletionResultBuilder builder(Sink, CodeCompletionResult::Pattern,
SemanticContextKind::None, {});
builder.addLeftParen();
builder.addSimpleNamedParameter("item");
builder.addComma();
builder.addSimpleNamedParameter("item");
builder.addRightParen();
for (auto T : ExpectedTypes) {
if (!T)
continue;
if (T->getAs<TupleType>()) {
addTypeAnnotation(builder, T);
builder.setExpectedTypeRelation(CodeCompletionResult::Identical);
break;
}
}
}
}
struct FilteredDeclConsumer : public swift::VisibleDeclConsumer {