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] Use GenericSignature methods to get associatedtype reqs

Browse Source
This commit is contained in:
Rintaro Ishizaki
2020-01-08 21:00:49 -08:00
parent 1dd6fe5688
commit b9f1e58b37
2 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/IDE/CodeCompletion.cpp
View File

@@ -4201,28 +4201,21 @@ public:
// If resolved print it.
return nullptr;
// Collect requirements on the associatedtype.
ProtocolDecl *protoD =
ResultT->castTo<DependentMemberType>()->getAssocType()->getProtocol();
auto genericSig = VD->getDeclContext()->getGenericSignatureOfContext();
if (genericSig->isConcreteType(ResultT))
// If it has same type requrement, we will emit the concrete type.
return nullptr;
// Collect requirements on the associatedtype.
SmallVector<Type, 2> opaqueTypes;
bool hasExplicitAnyObject = false;
for (auto req : protoD->getRequirementSignature()) {
if (!req.getFirstType()->isEqual(ResultT))
continue;
switch (req.getKind()) {
case RequirementKind::Conformance:
case RequirementKind::Superclass:
opaqueTypes.push_back(req.getSecondType());
break;
case RequirementKind::Layout:
hasExplicitAnyObject |= req.getLayoutConstraint()->isClass();
break;
case RequirementKind::SameType:
return nullptr;
}
}
if (auto superTy = genericSig->getSuperclassBound(ResultT))
opaqueTypes.push_back(superTy);
for (auto proto : genericSig->getConformsTo(ResultT))
opaqueTypes.push_back(proto->getDeclaredInterfaceType());
if (auto layout = genericSig->getLayoutConstraint(ResultT))
hasExplicitAnyObject = layout->isClass();
if (!hasExplicitAnyObject) {
if (opaqueTypes.empty())