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

Introduce isDecl and getDeclType

Browse Source 
fix enum logic issue

fix tests

guard against null types
This commit is contained in:
Azoy
2021-04-18 01:27:46 -04:00
parent f75f5fe78d
commit 9ed732f0ab
62 changed files with 391 additions and 569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/IDE/Refactoring.cpp
View File

@@ -1888,20 +1888,20 @@ findConcatenatedExpressions(const ResolvedRangeInfo &Info, ASTContext &Ctx) {
// FIXME: we should have ErrorType instead of null.
if (E->getType().isNull())
return true;
auto ExprType = E->getType()->getNominalOrBoundGenericNominal();
//Only binary concatenation operators should exist in expression
if (E->getKind() == ExprKind::Binary) {
auto *BE = dyn_cast<BinaryExpr>(E);
auto *OperatorDeclRef = BE->getSemanticFn()->getMemberOperatorRef();
if (!(isConcatenationExpr(OperatorDeclRef)
&& ExprType == Ctx.getStringDecl())) {
if (!(isConcatenationExpr(OperatorDeclRef) &&
E->getType()->isString())) {
IsValidInterpolation = false;
return false;
}
return true;
}
// Everything that evaluates to string should be gathered.
if (ExprType == Ctx.getStringDecl()) {
if (E->getType()->isString()) {
Bucket->insert(E);
return false;
}
@@ -3897,15 +3897,6 @@ namespace asyncrefactorings {
// TODO: Should probably split the refactorings into separate files
/// Whether the given type is the stdlib Result type
bool isResultType(Type Ty) {
if (!Ty)
return false;
if (auto *NTD = Ty->getAnyNominal())
return NTD == NTD->getASTContext().getResultDecl();
return false;
}
/// Whether the given type is (or conforms to) the stdlib Error type
bool isErrorType(Type Ty, ModuleDecl *MD) {
if (!Ty)
@@ -4116,7 +4107,7 @@ struct AsyncHandlerDesc {
if (HandlerParams.size() == 1) {
auto ParamTy =
HandlerParams.back().getPlainType()->getAs<BoundGenericType>();
if (isResultType(ParamTy)) {
if (ParamTy && ParamTy->isResult()) {
auto GenericArgs = ParamTy->getGenericArgs();
assert(GenericArgs.size() == 2 && "Result should have two params");
HandlerDesc.Type = HandlerType::RESULT;
@@ -4127,7 +4118,7 @@ struct AsyncHandlerDesc {
if (HandlerDesc.Type != HandlerType::RESULT) {
// Only handle non-result parameters
for (auto &Param : HandlerParams) {
if (isResultType(Param.getPlainType()))
if (Param.getPlainType() && Param.getPlainType()->isResult())
return AsyncHandlerDesc();
}
@@ -4336,7 +4327,8 @@ private:
void initFromEnumPattern(const Decl *D, const EnumElementPattern *EEP) {
if (auto *EED = EEP->getElementDecl()) {
if (!isResultType(EED->getParentEnum()->getDeclaredType()))
auto eedTy = EED->getParentEnum()->getDeclaredType();
if (!eedTy || !eedTy->isResult())
return;
if (EED->getNameStr() == StringRef("failure"))
ErrorCase = true;
@@ -4358,7 +4350,7 @@ private:
return;
auto *BaseDRE = dyn_cast<DeclRefExpr>(DSC->getBase());
if (!isResultType(BaseDRE->getType()))
if (!BaseDRE->getType() || !BaseDRE->getType()->isResult())
return;
auto *FnDRE = dyn_cast<DeclRefExpr>(DSC->getFn());