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

Merge pull request #36953 from Azoy/isType-isDeclType

Browse Source 
[NFC] Introduce isDecl and getDeclType
This commit is contained in:
Alejandro Alonso
2021-04-20 15:33:00 -04:00
committed by GitHub
parent c8ba622532 9ed732f0ab
commit 444c35cf8d
62 changed files with 391 additions and 569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/IDE/CodeCompletion.cpp
View File

@@ -1725,11 +1725,11 @@ static Type
defaultTypeLiteralKind(CodeCompletionLiteralKind kind, ASTContext &Ctx) {
switch (kind) {
case CodeCompletionLiteralKind::BooleanLiteral:
return Ctx.getBoolDecl()->getDeclaredInterfaceType();
return Ctx.getBoolType();
case CodeCompletionLiteralKind::IntegerLiteral:
return Ctx.getIntDecl()->getDeclaredInterfaceType();
return Ctx.getIntType();
case CodeCompletionLiteralKind::StringLiteral:
return Ctx.getStringDecl()->getDeclaredInterfaceType();
return Ctx.getStringType();
case CodeCompletionLiteralKind::ArrayLiteral:
return Ctx.getArrayDecl()->getDeclaredType();
case CodeCompletionLiteralKind::DictionaryLiteral:
@@ -4344,7 +4344,7 @@ public:
builder.addRightBracket();
});
auto floatType = context.getFloatDecl()->getDeclaredInterfaceType();
auto floatType = context.getFloatType();
addFromProto(LK::ColorLiteral, [&](Builder &builder) {
builder.addBaseName("#colorLiteral");
builder.addLeftParen();
@@ -4358,7 +4358,7 @@ public:
builder.addRightParen();
});
auto stringType = context.getStringDecl()->getDeclaredInterfaceType();
auto stringType = context.getStringType();
addFromProto(LK::ImageLiteral, [&](Builder &builder) {
builder.addBaseName("#imageLiteral");
builder.addLeftParen();
@@ -4408,7 +4408,7 @@ public:
}
}
if (!addedKeyPath && T->getAnyNominal() == Ctx.getStringDecl()) {
if (!addedKeyPath && T->isString()) {
addPoundKeyPath(needPound);
if (addedSelector)
break;