Skip to content

Commit 1e5dc37

Browse files
QuietMisdreavusQuietMisdreavus
committed
don't print USRs for type parameters into symbol graphs
rdar://73478316
1 parent ae7e1b5 commit 1e5dc37

File tree

6 files changed

+13
-23
lines changed

6 files changed

+13
-23
lines changed

‎lib/SymbolGraphGen/DeclarationFragmentPrinter.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,10 @@ void DeclarationFragmentPrinter::printTypeRef(Type T, const TypeDecl *RefTo,
146146
ShouldLink = false;
147147
}
148148
}
149+
150+
if (T->isTypeParameter()) {
151+
ShouldLink = false;
152+
}
149153
}
150154

151155
if (ShouldLink) {

‎test/SourceKit/CursorInfo/cursor_symbol_graph.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,6 @@ enum MyEnum {
539539
// CHECKBAR_ALL: },
540540
// CHECKBAR_ALL: {
541541
// CHECKBAR_ALL: "kind": "typeIdentifier",
542-
// CHECKBAR_GEN: "preciseIdentifier": "s:19cursor_symbol_graph3FooV1Txmfp",
543542
// CHECKBAR_GEN: "spelling": "T"
544543
// CHECKBAR_INT: "preciseIdentifier": "s:Si",
545544
// CHECKBAR_INT: "spelling": "Int"
@@ -564,7 +563,6 @@ enum MyEnum {
564563
// CHECKBAR_GEN: },
565564
// CHECKBAR_GEN: {
566565
// CHECKBAR_GEN: "kind": "typeIdentifier",
567-
// CHECKBAR_GEN: "preciseIdentifier": "s:19cursor_symbol_graph3FooV1Txmfp",
568566
// CHECKBAR_GEN: "spelling": "T"
569567
// CHECKBAR_GEN: },
570568
// CHECKBAR_GEN: {
@@ -608,7 +606,6 @@ enum MyEnum {
608606
// CHECKBAR_ALL: },
609607
// CHECKBAR_ALL: {
610608
// CHECKBAR_ALL: "kind": "typeIdentifier",
611-
// CHECKBAR_GEN: "preciseIdentifier": "s:19cursor_symbol_graph3FooV1Txmfp",
612609
// CHECKBAR_GEN: "spelling": "T"
613610
// CHECKBAR_INT: "preciseIdentifier": "s:Si",
614611
// CHECKBAR_INT: "spelling": "Int"
@@ -669,7 +666,6 @@ enum MyEnum {
669666
// CHECKBAR_ALL: },
670667
// CHECKBAR_ALL: {
671668
// CHECKBAR_ALL: "kind": "typeIdentifier",
672-
// CHECKBAR_GEN: "preciseIdentifier": "s:19cursor_symbol_graph3FooV1Txmfp",
673669
// CHECKBAR_GEN: "spelling": "T"
674670
// CHECKBAR_INT: "preciseIdentifier": "s:Si",
675671
// CHECKBAR_INT: "spelling": "Int"
@@ -708,7 +704,6 @@ enum MyEnum {
708704
// CHECKBAR_ALL: },
709705
// CHECKBAR_ALL: {
710706
// CHECKBAR_ALL: "kind": "typeIdentifier",
711-
// CHECKBAR_GEN: "preciseIdentifier": "s:19cursor_symbol_graph3FooV1Txmfp",
712707
// CHECKBAR_GEN: "spelling": "T"
713708
// CHECKBAR_INT: "preciseIdentifier": "s:Si",
714709
// CHECKBAR_INT: "spelling": "Int"

‎test/SymbolGraph/Symbols/Mixins/DeclarationFragments/Full/Function.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ public func foo<S>(f: @escaping () -> (), ext int: Int = 2, s: S) where S: Seque
8181
// CHECK-NEXT: },
8282
// CHECK-NEXT: {
8383
// CHECK-NEXT: "kind": "typeIdentifier",
84-
// CHECK-NEXT: "spelling": "S",
85-
// CHECK-NEXT: "preciseIdentifier": "s:8Function3foo1f3ext1syyyc_SixtSTRzlF1SL_xmfp"
84+
// CHECK-NEXT: "spelling": "S"
8685
// CHECK-NEXT: },
8786
// CHECK-NEXT: {
8887
// CHECK-NEXT: "kind": "text",
@@ -98,8 +97,7 @@ public func foo<S>(f: @escaping () -> (), ext int: Int = 2, s: S) where S: Seque
9897
// CHECK-NEXT: },
9998
// CHECK-NEXT: {
10099
// CHECK-NEXT: "kind": "typeIdentifier",
101-
// CHECK-NEXT: "spelling": "S",
102-
// CHECK-NEXT: "preciseIdentifier": "s:8Function3foo1f3ext1syyyc_SixtSTRzlF1SL_xmfp"
100+
// CHECK-NEXT: "spelling": "S"
103101
// CHECK-NEXT: },
104102
// CHECK-NEXT: {
105103
// CHECK-NEXT: "kind": "text",

‎test/SymbolGraph/Symbols/Mixins/DeclarationFragments/Full/NominalTypes.swift

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ public protocol P {}
5454
// STRUCT-NEXT: },
5555
// STRUCT-NEXT: {
5656
// STRUCT-NEXT: "kind": "typeIdentifier",
57-
// STRUCT-NEXT: "spelling": "T",
58-
// STRUCT-NEXT: "preciseIdentifier": "s:12NominalTypes1SV1Txmfp"
57+
// STRUCT-NEXT: "spelling": "T"
5958
// STRUCT-NEXT: }
6059
// STRUCT-NEXT: {
6160
// STRUCT-NEXT: "kind": "text",
@@ -106,8 +105,7 @@ public class C<T> where T: Sequence {}
106105
// CLASS-NEXT: },
107106
// CLASS-NEXT: {
108107
// CLASS-NEXT: "kind": "typeIdentifier",
109-
// CLASS-NEXT: "spelling": "T",
110-
// CLASS-NEXT: "preciseIdentifier": "s:12NominalTypes1CC1Txmfp"
108+
// CLASS-NEXT: "spelling": "T"
111109
// CLASS-NEXT: }
112110
// CLASS-NEXT: {
113111
// CLASS-NEXT: "kind": "text",
@@ -158,8 +156,7 @@ public enum E<T> where T: Sequence {}
158156
// ENUM-NEXT: },
159157
// ENUM-NEXT: {
160158
// ENUM-NEXT: "kind": "typeIdentifier",
161-
// ENUM-NEXT: "spelling": "T",
162-
// ENUM-NEXT: "preciseIdentifier": "s:12NominalTypes1EO1Txmfp"
159+
// ENUM-NEXT: "spelling": "T"
163160
// ENUM-NEXT: }
164161
// ENUM-NEXT: {
165162
// ENUM-NEXT: "kind": "text",
@@ -211,8 +208,7 @@ public typealias TA<T> = S<T> where T: Sequence
211208
// TYPEALIAS-NEXT: },
212209
// TYPEALIAS-NEXT: {
213210
// TYPEALIAS-NEXT: "kind": "typeIdentifier",
214-
// TYPEALIAS-NEXT: "spelling": "T",
215-
// TYPEALIAS-NEXT: "preciseIdentifier": "s:12NominalTypes2TAa1Txmfp"
211+
// TYPEALIAS-NEXT: "spelling": "T"
216212
// TYPEALIAS-NEXT: }
217213
// TYPEALIAS-NEXT: {
218214
// TYPEALIAS-NEXT: "kind": "text",
@@ -228,8 +224,7 @@ public typealias TA<T> = S<T> where T: Sequence
228224
// TYPEALIAS-NEXT: },
229225
// TYPEALIAS-NEXT: {
230226
// TYPEALIAS-NEXT: "kind": "typeIdentifier",
231-
// TYPEALIAS-NEXT: "spelling": "T",
232-
// TYPEALIAS-NEXT: "preciseIdentifier": "s:12NominalTypes2TAa1Txmfp"
227+
// TYPEALIAS-NEXT: "spelling": "T"
233228
// TYPEALIAS-NEXT: }
234229
// TYPEALIAS-NEXT: {
235230
// TYPEALIAS-NEXT: "kind": "text",

‎test/SymbolGraph/Symbols/Mixins/DeclarationFragments/Navigator/Navigator.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ public struct MyStruct<S> { public var x: S
8282
// BAR-NEXT: }
8383
// BAR-NEXT: {
8484
// BAR-NEXT: "kind": "typeIdentifier",
85-
// BAR-NEXT: "spelling": "T",
86-
// BAR-NEXT: "preciseIdentifier": "s:9Navigator8MyStructV3bar1xyqd___tSTRd__lF1TL_qd__mfp"
85+
// BAR-NEXT: "spelling": "T"
8786
// BAR-NEXT: }
8887
// BAR-NEXT: {
8988
// BAR-NEXT: "kind": "text",

‎test/SymbolGraph/Symbols/Mixins/DeclarationFragments/Subheading/Function.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ public func foo<S>(f: @escaping () -> (), ext int: Int = 2, s: S) where S: Seque
7070
// CHECK-NEXT: },
7171
// CHECK-NEXT: {
7272
// CHECK-NEXT: "kind": "typeIdentifier",
73-
// CHECK-NEXT: "spelling": "S",
74-
// CHECK-NEXT: "preciseIdentifier": "s:8Function3foo1f3ext1syyyc_SixtSTRzlF1SL_xmfp"
73+
// CHECK-NEXT: "spelling": "S"
7574
// CHECK-NEXT: },
7675
// CHECK-NEXT: {
7776
// CHECK-NEXT: "kind": "text",

0 commit comments

Comments
 (0)