averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[SourceKit/DocSupport] List generic requirements from contextual where clauses in doc info request

Browse Source 
We previously didn't report the requirements in the where clause of 'boxes'
below because it didn't have generic parameters of its own:

public struct Box<Wrapped> {
    public func boxes() -> [Box<Wrapped.Element>] where Wrapped: Sequence { fatalError() }
}

Resolves rdar://problem/60658263
This commit is contained in:
Nathan Hawes
2020-04-06 11:43:14 -07:00
parent 51a2a07be6
commit af0509e106
3 changed files with 1200 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp
View File

@@ -261,26 +261,34 @@ struct SourceTextInfo {
} // end anonymous namespace
static void initDocGenericParams(const Decl *D, DocEntityInfo &Info) {
auto *DC = dyn_cast<DeclContext>(D);
if (DC == nullptr || !DC->isInnermostContextGeneric())
auto *GC = D->getAsGenericContext();
if (!GC)
return;
GenericSignature GenericSig = DC->getGenericSignatureOfContext();
GenericSignature GenericSig = GC->getGenericSignatureOfContext();
if (!GenericSig)
return;
// The declaration may not be generic itself, but instead carry additional
// generic requirements in a contextual where clause, so checking !isGeneric()
// is insufficient.
const auto ParentSig = GC->getParent()->getGenericSignatureOfContext();
if (ParentSig && ParentSig->isEqual(GenericSig))
return;
// FIXME: Not right for extensions of nested generic types
for (auto *GP : GenericSig->getInnermostGenericParams()) {
if (GP->getDecl()->isImplicit())
continue;
DocGenericParam Param;
Param.Name = std::string(GP->getName());
Info.GenericParams.push_back(Param);
if (GC->isGeneric()) {
for (auto *GP : GenericSig->getInnermostGenericParams()) {
if (GP->getDecl()->isImplicit())
continue;
DocGenericParam Param;
Param.Name = std::string(GP->getName());
Info.GenericParams.push_back(Param);
}
}
ProtocolDecl *proto = nullptr;
if (auto *typeDC = DC->getInnermostTypeContext())
if (auto *typeDC = GC->getInnermostTypeContext())
proto = typeDC->getSelfProtocolDecl();
for (auto &Req : GenericSig->getRequirements()) {