Skip to content

Commit 495732e

Browse files
QuietMisdreavusQuietMisdreavus
committed
don't emit subHeading name if it's the same as navigator
rdar://70202693
1 parent 66e712b commit 495732e

File tree

8 files changed

+7
-158
lines changed

8 files changed

+7
-158
lines changed

‎lib/SymbolGraphGen/SymbolGraph.cpp

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -612,17 +612,9 @@ void
612612
SymbolGraph::serializeSubheadingDeclarationFragments(StringRef Key,
613613
const Symbol &S,
614614
llvm::json::OStream &OS) {
615-
DeclarationFragmentPrinter Printer(this, OS, Key);
616-
617615
if (const auto *TD = dyn_cast<GenericTypeDecl>(S.getSymbolDecl())) {
616+
DeclarationFragmentPrinter Printer(this, OS, Key);
618617
Printer.printAbridgedType(TD, /*PrintKeyword=*/true);
619-
} else {
620-
auto Options = getSubHeadingDeclarationFragmentsPrintOptions();
621-
if (S.getBaseType()) {
622-
Options.setBaseType(S.getBaseType());
623-
Options.PrintAsMember = true;
624-
}
625-
S.getSymbolDecl()->print(Printer, Options);
626618
}
627619
}
628620

‎test/SourceKit/CursorInfo/cursor_stdlib.swift

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -196,33 +196,6 @@ func foo3(a: Float, b: Bool) {}
196196
// CHECK-REPLACEMENT4: "spelling": ")"
197197
// CHECK-REPLACEMENT4: }
198198
// CHECK-REPLACEMENT4: ],
199-
// CHECK-REPLACEMENT4: "subHeading": [
200-
// CHECK-REPLACEMENT4: {
201-
// CHECK-REPLACEMENT4: "kind": "keyword",
202-
// CHECK-REPLACEMENT4: "spelling": "func"
203-
// CHECK-REPLACEMENT4: },
204-
// CHECK-REPLACEMENT4: {
205-
// CHECK-REPLACEMENT4: "kind": "text",
206-
// CHECK-REPLACEMENT4: "spelling": " "
207-
// CHECK-REPLACEMENT4: },
208-
// CHECK-REPLACEMENT4: {
209-
// CHECK-REPLACEMENT4: "kind": "identifier",
210-
// CHECK-REPLACEMENT4: "spelling": "append"
211-
// CHECK-REPLACEMENT4: },
212-
// CHECK-REPLACEMENT4: {
213-
// CHECK-REPLACEMENT4: "kind": "text",
214-
// CHECK-REPLACEMENT4: "spelling": "("
215-
// CHECK-REPLACEMENT4: },
216-
// CHECK-REPLACEMENT4: {
217-
// CHECK-REPLACEMENT4: "kind": "typeIdentifier",
218-
// CHECK-REPLACEMENT4: "preciseIdentifier": "s:13cursor_stdlib2S1V",
219-
// CHECK-REPLACEMENT4: "spelling": "S1"
220-
// CHECK-REPLACEMENT4: },
221-
// CHECK-REPLACEMENT4: {
222-
// CHECK-REPLACEMENT4: "kind": "text",
223-
// CHECK-REPLACEMENT4: "spelling": ")"
224-
// CHECK-REPLACEMENT4: }
225-
// CHECK-REPLACEMENT4: ],
226199
// CHECK-REPLACEMENT4: "title": "append(_:)"
227200
// CHECK-REPLACEMENT4: },
228201
// CHECK-REPLACEMENT4: "pathComponents": [

‎test/SourceKit/CursorInfo/cursor_symbol_graph.swift

Lines changed: 0 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -149,29 +149,6 @@ enum MyEnum {
149149
// CHECKX: "spelling": "Int"
150150
// CHECKX: }
151151
// CHECKX: ],
152-
// CHECKX: "subHeading": [
153-
// CHECKX: {
154-
// CHECKX: "kind": "keyword",
155-
// CHECKX: "spelling": "let"
156-
// CHECKX: },
157-
// CHECKX: {
158-
// CHECKX: "kind": "text",
159-
// CHECKX: "spelling": " "
160-
// CHECKX: },
161-
// CHECKX: {
162-
// CHECKX: "kind": "identifier",
163-
// CHECKX: "spelling": "x"
164-
// CHECKX: },
165-
// CHECKX: {
166-
// CHECKX: "kind": "text",
167-
// CHECKX: "spelling": ": "
168-
// CHECKX: },
169-
// CHECKX: {
170-
// CHECKX: "kind": "typeIdentifier",
171-
// CHECKX: "preciseIdentifier": "s:Si",
172-
// CHECKX: "spelling": "Int"
173-
// CHECKX: }
174-
// CHECKX: ],
175152
// CHECKX: "title": "x"
176153
// CHECKX: },
177154
// CHECKX: "pathComponents": [
@@ -317,29 +294,6 @@ enum MyEnum {
317294
// CHECKY: "spelling": "String"
318295
// CHECKY: }
319296
// CHECKY: ],
320-
// CHECKY: "subHeading": [
321-
// CHECKY: {
322-
// CHECKY: "kind": "keyword",
323-
// CHECKY: "spelling": "var"
324-
// CHECKY: },
325-
// CHECKY: {
326-
// CHECKY: "kind": "text",
327-
// CHECKY: "spelling": " "
328-
// CHECKY: },
329-
// CHECKY: {
330-
// CHECKY: "kind": "identifier",
331-
// CHECKY: "spelling": "y"
332-
// CHECKY: },
333-
// CHECKY: {
334-
// CHECKY: "kind": "text",
335-
// CHECKY: "spelling": ": "
336-
// CHECKY: },
337-
// CHECKY: {
338-
// CHECKY: "kind": "typeIdentifier",
339-
// CHECKY: "preciseIdentifier": "s:SS",
340-
// CHECKY: "spelling": "String"
341-
// CHECKY: }
342-
// CHECKY: ],
343297
// CHECKY: "title": "y"
344298
// CHECKY: },
345299
// CHECKY: "pathComponents": [
@@ -677,44 +631,6 @@ enum MyEnum {
677631
// CHECKBAR_ALL: "spelling": ")"
678632
// CHECKBAR_ALL: }
679633
// CHECKBAR_ALL: ],
680-
// CHECKBAR_ALL: "subHeading": [
681-
// CHECKBAR_ALL: {
682-
// CHECKBAR_ALL: "kind": "keyword",
683-
// CHECKBAR_ALL: "spelling": "func"
684-
// CHECKBAR_ALL: },
685-
// CHECKBAR_ALL: {
686-
// CHECKBAR_ALL: "kind": "text",
687-
// CHECKBAR_ALL: "spelling": " "
688-
// CHECKBAR_ALL: },
689-
// CHECKBAR_ALL: {
690-
// CHECKBAR_ALL: "kind": "identifier",
691-
// CHECKBAR_ALL: "spelling": "bar"
692-
// CHECKBAR_ALL: },
693-
// CHECKBAR_ALL: {
694-
// CHECKBAR_ALL: "kind": "text",
695-
// CHECKBAR_ALL: "spelling": "("
696-
// CHECKBAR_ALL: },
697-
// CHECKBAR_ALL: {
698-
// CHECKBAR_ALL: "kind": "externalParam",
699-
// CHECKBAR_ALL: "spelling": "x"
700-
// CHECKBAR_ALL: },
701-
// CHECKBAR_ALL: {
702-
// CHECKBAR_ALL: "kind": "text",
703-
// CHECKBAR_ALL: "spelling": ": "
704-
// CHECKBAR_ALL: },
705-
// CHECKBAR_ALL: {
706-
// CHECKBAR_ALL: "kind": "typeIdentifier",
707-
// CHECKBAR_GEN: "spelling": "T"
708-
// CHECKBAR_INT: "preciseIdentifier": "s:Si",
709-
// CHECKBAR_INT: "spelling": "Int"
710-
// CHECKBAR_STR: "preciseIdentifier": "s:SS",
711-
// CHECKBAR_STR: "spelling": "String"
712-
// CHECKBAR_ALL: },
713-
// CHECKBAR_ALL: {
714-
// CHECKBAR_ALL: "kind": "text",
715-
// CHECKBAR_ALL: "spelling": ")"
716-
// CHECKBAR_ALL: }
717-
// CHECKBAR_ALL: ],
718634
// CHECKBAR_ALL: "title": "bar(x:)"
719635
// CHECKBAR_ALL: },
720636
// CHECKBAR_ALL: "pathComponents": [
@@ -829,20 +745,6 @@ enum MyEnum {
829745
// CHECKCASE: "spelling": "someCase"
830746
// CHECKCASE: }
831747
// CHECKCASE: ],
832-
// CHECKCASE: "subHeading": [
833-
// CHECKCASE: {
834-
// CHECKCASE: "kind": "keyword",
835-
// CHECKCASE: "spelling": "case"
836-
// CHECKCASE: },
837-
// CHECKCASE: {
838-
// CHECKCASE: "kind": "text",
839-
// CHECKCASE: "spelling": " "
840-
// CHECKCASE: },
841-
// CHECKCASE: {
842-
// CHECKCASE: "kind": "identifier",
843-
// CHECKCASE: "spelling": "someCase"
844-
// CHECKCASE: }
845-
// CHECKCASE: ],
846748
// CHECKCASE: "title": "someCase"
847749
// CHECKCASE: },
848750
// CHECKCASE: "pathComponents": [

‎test/SourceKit/CursorInfo/cursor_symbol_graph_objc.swift

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -80,24 +80,6 @@ func callObjC() {
8080
// CHECK: "spelling": "()"
8181
// CHECK: }
8282
// CHECK: ],
83-
// CHECK: "subHeading": [
84-
// CHECK: {
85-
// CHECK: "kind": "keyword",
86-
// CHECK: "spelling": "func"
87-
// CHECK: },
88-
// CHECK: {
89-
// CHECK: "kind": "text",
90-
// CHECK: "spelling": " "
91-
// CHECK: },
92-
// CHECK: {
93-
// CHECK: "kind": "identifier",
94-
// CHECK: "spelling": "fooFuncWithComment5"
95-
// CHECK: },
96-
// CHECK: {
97-
// CHECK: "kind": "text",
98-
// CHECK: "spelling": "()"
99-
// CHECK: }
100-
// CHECK: ],
10183
// CHECK: "title": "fooFuncWithComment5()"
10284
// CHECK: },
10385
// CHECK: "pathComponents": [
@@ -106,4 +88,4 @@ func callObjC() {
10688
// CHECK: }
10789
// CHECK: ]
10890
// CHECK: }
109-
// CHECK: SYMBOL GRAPH END
91+
// CHECK: SYMBOL GRAPH END

‎test/SymbolGraph/Symbols/Mixins/DeclarationFragments/Full/Properties/ComputedProperties.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public struct S {
6666

6767
// XSUBHEADING-LABEL: "precise": "s:18ComputedProperties1SV1xSivp"
6868
// XSUBHEADING: names
69-
// XSUBHEADING: "subHeading": [
69+
// XSUBHEADING: "navigator": [
7070
// XSUBHEADING-NEXT: {
7171
// XSUBHEADING-NEXT: "kind": "keyword",
7272
// XSUBHEADING-NEXT: "spelling": "var"
@@ -137,7 +137,7 @@ public struct S {
137137

138138
// YSUBHEADING-LABEL: "precise": "s:18ComputedProperties1SV1ySivp"
139139
// YSUBHEADING: names
140-
// YSUBHEADING: "subHeading": [
140+
// YSUBHEADING: "navigator": [
141141
// YSUBHEADING-NEXT: {
142142
// YSUBHEADING-NEXT: "kind": "keyword",
143143
// YSUBHEADING-NEXT: "spelling": "var"

‎test/SymbolGraph/Symbols/Mixins/DeclarationFragments/Full/Properties/ProtocolRequirements.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public protocol P {
5757

5858
// SUBHEADING-LABEL: "precise": "s:20ProtocolRequirements1PP1xSivp"
5959
// SUBHEADING: names
60-
// SUBHEADING: "subHeading": [
60+
// SUBHEADING: "navigator": [
6161
// SUBHEADING-NEXT: {
6262
// SUBHEADING-NEXT: "kind": "keyword",
6363
// SUBHEADING-NEXT: "spelling": "var"

‎test/SymbolGraph/Symbols/Mixins/DeclarationFragments/Full/Properties/Subscripts.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public struct S {
6969

7070
// SUBHEADING-LABEL: "precise": "s:10Subscripts1SVyS2icip"
7171
// SUBHEADING: names
72-
// SUBHEADING: "subHeading": [
72+
// SUBHEADING: "navigator": [
7373
// SUBHEADING-NEXT: {
7474
// SUBHEADING-NEXT: "kind": "keyword",
7575
// SUBHEADING-NEXT: "spelling": "subscript"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public func foo<S>(f: @escaping () -> (), ext int: Int = 2, s: S) where S: Seque
1010
// CHECK-LABEL: "precise": "s:8Function3foo1f3ext1syyyc_SixtSTRzlF"
1111
// CHECK: names
1212
// CHECK-NEXT: "title": "foo(f:ext:s:)"
13-
// CHECK: "subHeading": [
13+
// CHECK: "navigator": [
1414
// CHECK-NEXT: {
1515
// CHECK-NEXT: "kind": "keyword",
1616
// CHECK-NEXT: "spelling": "func"

0 commit comments

Comments
 (0)