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] Enable 'openArchetypes' when checking if convertible

Browse Source 
```swift
protocol Proto {}
struct ConcreteProto {}
struct MyStruct<T> {}

extension MyStruct where T: Proto {
  static var option: MyStruct<ConcreteProto> { get }
}
func foo<T: Proto>(arg: MyStruct<T>) {}
func test() {
  foo(arg: .#^HERE^#)
}
```
In this case, the type of `MyStruct.option` is `MyStruct<ConcreteProto>`
whereas the context type is `MyStruct<T> where T: Proto`.
When checking the convertibility of them , we need to "open archetype types".

rdar://problem/24570603
rdar://problem/51723460
This commit is contained in:
Rintaro Ishizaki
2019-06-28 14:28:00 -07:00
parent 4da49fcfee
commit 4d076e85c7
8 changed files with 62 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/IDE/ExprContextAnalysis.cpp
View File

@@ -353,14 +353,19 @@ static bool collectPossibleCalleesForApply(
auto *fnExpr = callExpr->getFn();
if (auto type = fnExpr->getType()) {
if (auto *funcType = type->getAs<AnyFunctionType>()) {
auto refDecl = fnExpr->getReferencedDecl();
if (!refDecl)
if (auto apply = dyn_cast<ApplyExpr>(fnExpr))
refDecl = apply->getFn()->getReferencedDecl();
candidates.emplace_back(funcType, refDecl.getDecl());
if (!type->hasUnresolvedType() && !type->hasError()) {
if (auto *funcType = type->getAs<AnyFunctionType>()) {
auto refDecl = fnExpr->getReferencedDecl();
if (!refDecl)
if (auto apply = dyn_cast<ApplyExpr>(fnExpr))
refDecl = apply->getFn()->getReferencedDecl();
candidates.emplace_back(funcType, refDecl.getDecl());
return true;
}
}
} else if (auto *DRE = dyn_cast<DeclRefExpr>(fnExpr)) {
}
if (auto *DRE = dyn_cast<DeclRefExpr>(fnExpr)) {
if (auto *decl = DRE->getDecl()) {
auto declType = decl->getInterfaceType();
if (auto *funcType = declType->getAs<AnyFunctionType>())
@@ -918,7 +923,13 @@ bool swift::ide::isReferenceableByImplicitMemberExpr(
// because we are emitting all `.init()`s.
if (declTy->isEqual(T))
return false;
return swift::isConvertibleTo(declTy, T, *DC);
// Only non-protocol nominal type can be instantiated.
auto nominal = declTy->getAnyNominal();
if (!nominal || isa<ProtocolDecl>(nominal))
return false;
return swift::isConvertibleTo(declTy, T, /*openArchetypes=*/true, *DC);
}
// Only static member can be referenced.
@@ -935,5 +946,6 @@ bool swift::ide::isReferenceableByImplicitMemberExpr(
// FIXME: This emits just 'factory'. We should emit 'factory()' instead.
declTy = FT->getResult();
}
return declTy->isEqual(T) || swift::isConvertibleTo(declTy, T, *DC);
return declTy->isEqual(T) ||
swift::isConvertibleTo(declTy, T, /*openArchetypes=*/true, *DC);
}