Skip to content

[4.1][SourceKitd] Avoid printing parent type directly on extended type. rdar://37965902 #14909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 1, 2018
Merged

[4.1][SourceKitd] Avoid printing parent type directly on extended type. rdar://37965902 #14909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions lib/AST/ASTPrinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1751,15 +1751,15 @@ static void printExtendedTypeName(Type ExtendedType, ASTPrinter &Printer,
PrintOptions Options) {
auto Nominal = ExtendedType->getAnyNominal();
assert(Nominal && "extension of non-nominal type");
if (auto ct = ExtendedType->getAs<ClassType>()) {
if (auto ParentType = ct->getParent()) {
ParentType.print(Printer, Options);
Printer << ".";
}
}
if (auto st = ExtendedType->getAs<StructType>()) {
if (auto ParentType = st->getParent()) {
ParentType.print(Printer, Options);
if (auto nt = ExtendedType->getAs<NominalType>()) {
if (auto ParentType = nt->getParent()) {
if (auto *PD = ParentType->getNominalOrBoundGenericNominal()) {
// Avoid using the parent type directly because it can be bound
// generic type and sugared.
PD->getDeclaredType().print(Printer, Options);
} else {
ParentType.print(Printer, Options);
}
Printer << ".";
}
}
Expand Down
4 changes: 4 additions & 0 deletions test/SourceKit/DocSupport/Inputs/cake1.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,7 @@ public protocol P3 {
public extension P2 where Self : P3 {
func fooConstraint() {}
}

public extension Dictionary.Keys {
public func foo() {}
}
Loading