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

[SourceKitd] Avoid printing parent type directly on extended type. rdar:37965902 (#14892)

Browse Source 
When printing parent type directly, we may print generic arguments and sugared
dictionary type.
This commit is contained in:
Xi Ge
2018-03-01 09:19:44 -08:00
committed by GitHub
parent be93fe04f5
commit 9f39c8494d
3 changed files with 95 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/AST/ASTPrinter.cpp
View File

@@ -1762,7 +1762,13 @@ static void printExtendedTypeName(Type ExtendedType, ASTPrinter &Printer,
assert(Nominal && "extension of non-nominal type");
if (auto nt = ExtendedType->getAs<NominalType>()) {
if (auto ParentType = nt->getParent()) {
ParentType.print(Printer, Options);
if (auto *ParentNT = ParentType->getAs<NominalOrBoundGenericNominalType>()) {
// Avoid using the parent type directly because it can be bound
// generic type and sugared.
ParentNT->getDecl()->getDeclaredType().print(Printer, Options);
} else {
ParentType.print(Printer, Options);
}
Printer << ".";
}
}

4
test/SourceKit/DocSupport/Inputs/cake1.swift
View File

@@ -25,3 +25,7 @@ public protocol P3 {
public extension P2 where Self : P3 {
func fooConstraint() {}
}
public extension Dictionary.Keys {
public func foo() {}
}

84
test/SourceKit/DocSupport/doc_swift_module1.swift.response
View File

@@ -41,6 +41,11 @@ protocol P3 {
func p3Required()
}
extension Dictionary.Keys where Key : Hashable {
func foo()
}
[
{
@@ -383,6 +388,52 @@ protocol P3 {
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 439,
key.length: 10
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 455,
key.length: 9
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Dictionary",
key.usr: "s:s10DictionaryV",
key.offset: 465,
key.length: 10
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Keys",
key.usr: "s:s10DictionaryV4KeysV",
key.offset: 476,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 481,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.typeidentifier,
key.offset: 487,
key.length: 3
},
{
key.kind: source.lang.swift.ref.protocol,
key.name: "Hashable",
key.usr: "s:s8HashableP",
key.offset: 493,
key.length: 8
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 509,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 514,
key.length: 3
}
]
[
@@ -610,5 +661,38 @@ protocol P3 {
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>p3Required</decl.name>()</decl.function.method.instance>"
}
]
},
{
key.kind: source.lang.swift.decl.extension.struct,
key.generic_params: [
{
key.name: "Key"
},
{
key.name: "Value"
}
],
key.generic_requirements: [
{
key.description: "Key : Hashable"
}
],
key.offset: 455,
key.length: 66,
key.extends: {
key.kind: source.lang.swift.ref.struct,
key.name: "Keys",
key.usr: "s:s10DictionaryV4KeysV"
},
key.entities: [
{
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "foo()",
key.usr: "s:s10DictionaryV4KeysV5cake1E3fooyyF",
key.offset: 509,
key.length: 10,
key.fully_annotated_decl: "<decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>foo</decl.name>()</decl.function.method.instance>"
}
]
}
]