Skip to content

Commit 32ba5f2

Browse files
author
Nathan Hawes
committed
[indexer] Don't output implicit symbol names in order to maintain the existing swift index responses
1 parent fdc74b4 commit 32ba5f2

File tree

6 files changed

+3
-25
lines changed

6 files changed

+3
-25
lines changed

‎test/SourceKit/Indexing/index.swift.response

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,12 @@
1919
key.entities: [
2020
{
2121
key.kind: source.lang.swift.decl.function.accessor.getter,
22-
key.name: "getter:globV",
2322
key.usr: "s:F5indexg5globVSi",
2423
key.line: 4,
2524
key.column: 5
2625
},
2726
{
2827
key.kind: source.lang.swift.decl.function.accessor.setter,
29-
key.name: "setter:globV",
3028
key.usr: "s:F5indexs5globVSi",
3129
key.line: 4,
3230
key.column: 5
@@ -268,7 +266,6 @@
268266
key.entities: [
269267
{
270268
key.kind: source.lang.swift.ref.function.accessor.setter,
271-
key.name: "setter:globV",
272269
key.usr: "s:F5indexs5globVSi",
273270
key.line: 37,
274271
key.column: 3
@@ -291,7 +288,6 @@
291288
key.entities: [
292289
{
293290
key.kind: source.lang.swift.ref.function.accessor.getter,
294-
key.name: "getter:instV",
295291
key.usr: "s:FC5index2CCg5instVS0_",
296292
key.line: 38,
297293
key.column: 9,
@@ -505,14 +501,12 @@
505501
key.entities: [
506502
{
507503
key.kind: source.lang.swift.decl.function.accessor.getter,
508-
key.name: "getter:globV2",
509504
key.usr: "s:F5indexg6globV2CS_5SubCC",
510505
key.line: 57,
511506
key.column: 5
512507
},
513508
{
514509
key.kind: source.lang.swift.decl.function.accessor.setter,
515-
key.name: "setter:globV2",
516510
key.usr: "s:F5indexs6globV2CS_5SubCC",
517511
key.line: 57,
518512
key.column: 5
@@ -756,7 +750,6 @@
756750
key.entities: [
757751
{
758752
key.kind: source.lang.swift.ref.function.accessor.getter,
759-
key.name: "getter:value",
760753
key.usr: "s:FC5index16ComputedPropertyg5valueSi",
761754
key.line: 92,
762755
key.column: 14,
@@ -774,7 +767,6 @@
774767
key.entities: [
775768
{
776769
key.kind: source.lang.swift.ref.function.accessor.getter,
777-
key.name: "getter:readOnly",
778770
key.usr: "s:FC5index16ComputedPropertyg8readOnlySi",
779771
key.line: 93,
780772
key.column: 10,
@@ -792,7 +784,6 @@
792784
key.entities: [
793785
{
794786
key.kind: source.lang.swift.ref.function.accessor.setter,
795-
key.name: "setter:value",
796787
key.usr: "s:FC5index16ComputedPropertys5valueSi",
797788
key.line: 94,
798789
key.column: 6,
@@ -817,7 +808,6 @@
817808
key.entities: [
818809
{
819810
key.kind: source.lang.swift.ref.function.accessor.getter,
820-
key.name: "getter:value",
821811
key.usr: "s:FC5index16ComputedPropertyg5valueSi",
822812
key.line: 95,
823813
key.column: 8,
@@ -826,7 +816,6 @@
826816
},
827817
{
828818
key.kind: source.lang.swift.ref.function.accessor.setter,
829-
key.name: "setter:value",
830819
key.usr: "s:FC5index16ComputedPropertys5valueSi",
831820
key.line: 95,
832821
key.column: 8,
@@ -844,7 +833,6 @@
844833
key.entities: [
845834
{
846835
key.kind: source.lang.swift.ref.function.accessor.getter,
847-
key.name: "getter:subscript(_:)",
848836
key.usr: "s:FC5index3CC2g9subscriptFSiSi",
849837
key.line: 96,
850838
key.column: 10,
@@ -862,7 +850,6 @@
862850
key.entities: [
863851
{
864852
key.kind: source.lang.swift.ref.function.accessor.setter,
865-
key.name: "setter:subscript(_:)",
866853
key.usr: "s:FC5index3CC2s9subscriptFSiSi",
867854
key.line: 97,
868855
key.column: 6,
@@ -887,7 +874,6 @@
887874
key.entities: [
888875
{
889876
key.kind: source.lang.swift.ref.function.accessor.getter,
890-
key.name: "getter:subscript(_:)",
891877
key.usr: "s:FC5index3CC2g9subscriptFSiSi",
892878
key.line: 98,
893879
key.column: 8,
@@ -896,7 +882,6 @@
896882
},
897883
{
898884
key.kind: source.lang.swift.ref.function.accessor.setter,
899-
key.name: "setter:subscript(_:)",
900885
key.usr: "s:FC5index3CC2s9subscriptFSiSi",
901886
key.line: 98,
902887
key.column: 8,
@@ -971,7 +956,6 @@
971956
key.entities: [
972957
{
973958
key.kind: source.lang.swift.ref.function.accessor.getter,
974-
key.name: "getter:globReadOnly",
975959
key.usr: "s:F5indexg12globReadOnlyVS_2S2",
976960
key.line: 112,
977961
key.column: 3

‎test/SourceKit/Indexing/index_bad_modulename.swift.response

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,12 @@
1919
key.entities: [
2020
{
2121
key.kind: source.lang.swift.decl.function.accessor.getter,
22-
key.name: "getter:v",
2322
key.usr: "s:F4maing1vGSqCSo8NSObject_",
2423
key.line: 7,
2524
key.column: 5
2625
},
2726
{
2827
key.kind: source.lang.swift.decl.function.accessor.setter,
29-
key.name: "setter:v",
3028
key.usr: "s:F4mains1vGSqCSo8NSObject_",
3129
key.line: 7,
3230
key.column: 5

‎test/SourceKit/Indexing/index_big_array.swift.response

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,12 @@
1919
key.entities: [
2020
{
2121
key.kind: source.lang.swift.decl.function.accessor.getter,
22-
key.name: "getter:gCubeVertexData",
2322
key.usr: "s:F9big_arrayg15gCubeVertexDataGSaSf_",
2423
key.line: 1,
2524
key.column: 5
2625
},
2726
{
2827
key.kind: source.lang.swift.decl.function.accessor.setter,
29-
key.name: "setter:gCubeVertexData",
3028
key.usr: "s:F9big_arrays15gCubeVertexDataGSaSf_",
3129
key.line: 1,
3230
key.column: 5

‎test/SourceKit/Indexing/index_enum_case.swift.response

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,12 @@
104104
key.entities: [
105105
{
106106
key.kind: source.lang.swift.decl.function.accessor.getter,
107-
key.name: "getter:e",
108107
key.usr: "s:F15index_enum_caseg1eOS_1E",
109108
key.line: 21,
110109
key.column: 5
111110
},
112111
{
113112
key.kind: source.lang.swift.decl.function.accessor.setter,
114-
key.name: "setter:e",
115113
key.usr: "s:F15index_enum_cases1eOS_1E",
116114
key.line: 21,
117115
key.column: 5

‎test/SourceKit/Indexing/index_forbid_typecheck.swift.response

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,12 @@
1919
key.entities: [
2020
{
2121
key.kind: source.lang.swift.decl.function.accessor.getter,
22-
key.name: "getter:globalPrim",
2322
key.usr: "s:F18forbid_typecheck_2g10globalPrimSi",
2423
key.line: 1,
2524
key.column: 5
2625
},
2726
{
2827
key.kind: source.lang.swift.decl.function.accessor.setter,
29-
key.name: "setter:globalPrim",
3028
key.usr: "s:F18forbid_typecheck_2s10globalPrimSi",
3129
key.line: 1,
3230
key.column: 5

‎tools/SourceKit/lib/SwiftLang/SwiftIndexing.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,11 @@ class SKIndexDataConsumer : public IndexDataConsumer {
114114
bool withEntityInfo(const IndexSymbol &symbol, F func) {
115115
EntityInfo info;
116116
bool isRef = symbol.roles & (unsigned)SymbolRole::Reference;
117+
bool isImplicit = symbol.roles & (unsigned)SymbolRole::Implicit;
118+
117119
info.Kind = SwiftLangSupport::getUIDForSymbol(symbol.kind, symbol.subKinds,
118120
isRef);
119-
info.Name = symbol.name;
121+
info.Name = isImplicit? "" : symbol.name;
120122
info.USR = symbol.USR;
121123
info.Group = symbol.group;
122124
info.Line = symbol.line;

0 commit comments

Comments
 (0)