Skip to content

Commit c51f884

Browse files
slavapestovslavapestov
committed
SourceKit: Just always call getFormalAccess()
1 parent c68cbe8 commit c51f884

10 files changed

+56
-98
lines changed

‎test/SourceKit/DocumentStructure/access_parse.swift.response

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@
338338
key.name: "PrivAccess",
339339
key.offset: 575,
340340
key.length: 212,
341-
key.runtime_name: "_TtC6Access10PrivAccess",
341+
key.runtime_name: "_TtC6AccessP33_1EF422E8C69A0040C015C634ED7C6DE810PrivAccess",
342342
key.nameoffset: 581,
343343
key.namelength: 10,
344344
key.bodyoffset: 593,
@@ -353,8 +353,8 @@
353353
key.substructure: [
354354
{
355355
key.kind: source.lang.swift.decl.var.instance,
356-
key.accessibility: source.lang.swift.accessibility.private,
357-
key.setter_accessibility: source.lang.swift.accessibility.private,
356+
key.accessibility: source.lang.swift.accessibility.internal,
357+
key.setter_accessibility: source.lang.swift.accessibility.internal,
358358
key.name: "defProp",
359359
key.offset: 596,
360360
key.length: 21,
@@ -436,7 +436,7 @@
436436
},
437437
{
438438
key.kind: source.lang.swift.decl.class,
439-
key.accessibility: source.lang.swift.accessibility.private,
439+
key.accessibility: source.lang.swift.accessibility.internal,
440440
key.name: "Nested",
441441
key.offset: 745,
442442
key.length: 40,
@@ -447,7 +447,7 @@
447447
key.substructure: [
448448
{
449449
key.kind: source.lang.swift.decl.function.method.instance,
450-
key.accessibility: source.lang.swift.accessibility.private,
450+
key.accessibility: source.lang.swift.accessibility.internal,
451451
key.name: "defFunc()",
452452
key.offset: 764,
453453
key.length: 17,
@@ -552,7 +552,7 @@
552552
key.substructure: [
553553
{
554554
key.kind: source.lang.swift.decl.enumelement,
555-
key.accessibility: source.lang.swift.accessibility.internal,
555+
key.accessibility: source.lang.swift.accessibility.public,
556556
key.name: "Some",
557557
key.offset: 916,
558558
key.length: 4,
@@ -570,7 +570,7 @@
570570
key.substructure: [
571571
{
572572
key.kind: source.lang.swift.decl.enumelement,
573-
key.accessibility: source.lang.swift.accessibility.internal,
573+
key.accessibility: source.lang.swift.accessibility.public,
574574
key.name: "Else",
575575
key.offset: 928,
576576
key.length: 4,
@@ -777,6 +777,7 @@
777777
},
778778
{
779779
key.kind: source.lang.swift.decl.extension,
780+
key.accessibility: source.lang.swift.accessibility.internal,
780781
key.name: "DefAccess",
781782
key.offset: 1399,
782783
key.length: 43,
@@ -800,6 +801,7 @@
800801
},
801802
{
802803
key.kind: source.lang.swift.decl.extension,
804+
key.accessibility: source.lang.swift.accessibility.internal,
803805
key.name: "PubAccess",
804806
key.offset: 1443,
805807
key.length: 43,
@@ -823,6 +825,7 @@
823825
},
824826
{
825827
key.kind: source.lang.swift.decl.extension,
828+
key.accessibility: source.lang.swift.accessibility.internal,
826829
key.name: "IntAccess",
827830
key.offset: 1487,
828831
key.length: 43,
@@ -846,6 +849,7 @@
846849
},
847850
{
848851
key.kind: source.lang.swift.decl.extension,
852+
key.accessibility: source.lang.swift.accessibility.internal,
849853
key.name: "PrivAccess",
850854
key.offset: 1531,
851855
key.length: 44,
@@ -869,7 +873,7 @@
869873
},
870874
{
871875
key.kind: source.lang.swift.decl.extension,
872-
key.accessibility: source.lang.swift.accessibility.private,
876+
key.accessibility: source.lang.swift.accessibility.fileprivate,
873877
key.name: "PubAccess",
874878
key.offset: 1584,
875879
key.length: 47,
@@ -887,7 +891,7 @@
887891
key.substructure: [
888892
{
889893
key.kind: source.lang.swift.decl.function.method.instance,
890-
key.accessibility: source.lang.swift.accessibility.private,
894+
key.accessibility: source.lang.swift.accessibility.fileprivate,
891895
key.name: "privExtFunc()",
892896
key.offset: 1608,
893897
key.length: 21,

‎test/SourceKit/DocumentStructure/structure.swift.empty.response

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@
223223
},
224224
{
225225
key.kind: source.lang.swift.decl.extension,
226+
key.accessibility: source.lang.swift.accessibility.internal,
226227
key.name: "OuterCls",
227228
key.offset: 377,
228229
key.length: 45,
@@ -557,6 +558,7 @@
557558
},
558559
{
559560
key.kind: source.lang.swift.decl.extension,
561+
key.accessibility: source.lang.swift.accessibility.internal,
560562
key.name: "Foo",
561563
key.offset: 999,
562564
key.length: 58,

‎test/SourceKit/DocumentStructure/structure.swift.foobar.response

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@
223223
},
224224
{
225225
key.kind: source.lang.swift.decl.extension,
226+
key.accessibility: source.lang.swift.accessibility.internal,
226227
key.name: "OuterCls",
227228
key.offset: 377,
228229
key.length: 45,
@@ -557,6 +558,7 @@
557558
},
558559
{
559560
key.kind: source.lang.swift.decl.extension,
561+
key.accessibility: source.lang.swift.accessibility.internal,
560562
key.name: "Foo",
561563
key.offset: 999,
562564
key.length: 58,

‎test/SourceKit/DocumentStructure/structure.swift.invalid.response

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
},
1717
{
1818
key.kind: source.lang.swift.decl.extension,
19+
key.accessibility: source.lang.swift.accessibility.internal,
1920
key.name: "OuterCls",
2021
key.offset: 12,
2122
key.length: 43,

‎test/SourceKit/DocumentStructure/structure.swift.response

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@
223223
},
224224
{
225225
key.kind: source.lang.swift.decl.extension,
226+
key.accessibility: source.lang.swift.accessibility.internal,
226227
key.name: "OuterCls",
227228
key.offset: 377,
228229
key.length: 45,
@@ -557,6 +558,7 @@
557558
},
558559
{
559560
key.kind: source.lang.swift.decl.extension,
561+
key.accessibility: source.lang.swift.accessibility.internal,
560562
key.name: "Foo",
561563
key.offset: 999,
562564
key.length: 58,

‎test/SourceKit/InterfaceGen/gen_clang_module.swift.apinotes_swift3.response

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1554,6 +1554,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
15541554
},
15551555
{
15561556
key.kind: source.lang.swift.decl.extension,
1557+
key.accessibility: source.lang.swift.accessibility.internal,
15571558
key.name: "GlobalToMember_Class_Container",
15581559
key.offset: 410,
15591560
key.length: 87,
@@ -1658,6 +1659,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
16581659
},
16591660
{
16601661
key.kind: source.lang.swift.decl.extension,
1662+
key.accessibility: source.lang.swift.accessibility.internal,
16611663
key.name: "MemberToGlobal_Class_Container",
16621664
key.offset: 649,
16631665
key.length: 105,
@@ -1748,6 +1750,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
17481750
},
17491751
{
17501752
key.kind: source.lang.swift.decl.extension,
1753+
key.accessibility: source.lang.swift.accessibility.internal,
17511754
key.name: "MemberToMember_Class_Swift3",
17521755
key.offset: 934,
17531756
key.length: 117,
@@ -1776,6 +1779,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
17761779
},
17771780
{
17781781
key.kind: source.lang.swift.decl.extension,
1782+
key.accessibility: source.lang.swift.accessibility.internal,
17791783
key.name: "MemberToMember_Class_Swift4",
17801784
key.offset: 1052,
17811785
key.length: 88,
@@ -1849,6 +1853,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
18491853
},
18501854
{
18511855
key.kind: source.lang.swift.decl.extension,
1856+
key.accessibility: source.lang.swift.accessibility.internal,
18521857
key.name: "MemberToMember_SameContainer_Class_Container",
18531858
key.offset: 1269,
18541859
key.length: 198,
@@ -1969,6 +1974,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
19691974
},
19701975
{
19711976
key.kind: source.lang.swift.decl.extension,
1977+
key.accessibility: source.lang.swift.accessibility.internal,
19721978
key.name: "MemberToMember_SameName_Class_Swift3",
19731979
key.offset: 1657,
19741980
key.length: 127,
@@ -1997,6 +2003,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
19972003
},
19982004
{
19992005
key.kind: source.lang.swift.decl.extension,
2006+
key.accessibility: source.lang.swift.accessibility.internal,
20002007
key.name: "MemberToMember_SameName_Class_Swift4",
20012008
key.offset: 1785,
20022009
key.length: 93,
@@ -2086,6 +2093,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
20862093
},
20872094
{
20882095
key.kind: source.lang.swift.decl.extension,
2096+
key.accessibility: source.lang.swift.accessibility.internal,
20892097
key.name: "GlobalToMember_Typedef_Container",
20902098
key.offset: 2250,
20912099
key.length: 82,
@@ -2161,6 +2169,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
21612169
},
21622170
{
21632171
key.kind: source.lang.swift.decl.extension,
2172+
key.accessibility: source.lang.swift.accessibility.internal,
21642173
key.name: "MemberToGlobal_Typedef_Container",
21652174
key.offset: 2485,
21662175
key.length: 109,
@@ -2251,6 +2260,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
22512260
},
22522261
{
22532262
key.kind: source.lang.swift.decl.extension,
2263+
key.accessibility: source.lang.swift.accessibility.internal,
22542264
key.name: "MemberToMember_Typedef_Swift3",
22552265
key.offset: 2778,
22562266
key.length: 121,
@@ -2279,6 +2289,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
22792289
},
22802290
{
22812291
key.kind: source.lang.swift.decl.extension,
2292+
key.accessibility: source.lang.swift.accessibility.internal,
22822293
key.name: "MemberToMember_Typedef_Swift4",
22832294
key.offset: 2900,
22842295
key.length: 83,
@@ -2338,6 +2349,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
23382349
},
23392350
{
23402351
key.kind: source.lang.swift.decl.extension,
2352+
key.accessibility: source.lang.swift.accessibility.internal,
23412353
key.name: "MemberToMember_SameContainer_Typedef_Container",
23422354
key.offset: 3114,
23432355
key.length: 195,
@@ -2444,6 +2456,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
24442456
},
24452457
{
24462458
key.kind: source.lang.swift.decl.extension,
2459+
key.accessibility: source.lang.swift.accessibility.internal,
24472460
key.name: "MemberToMember_SameName_Typedef_Swift3",
24482461
key.offset: 3503,
24492462
key.length: 131,
@@ -2472,6 +2485,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
24722485
},
24732486
{
24742487
key.kind: source.lang.swift.decl.extension,
2488+
key.accessibility: source.lang.swift.accessibility.internal,
24752489
key.name: "MemberToMember_SameName_Typedef_Swift4",
24762490
key.offset: 3635,
24772491
key.length: 88,

‎test/SourceKit/InterfaceGen/gen_clang_module.swift.apinotes_swift4.response

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,6 +1088,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
10881088
},
10891089
{
10901090
key.kind: source.lang.swift.decl.extension,
1091+
key.accessibility: source.lang.swift.accessibility.internal,
10911092
key.name: "GlobalToMember_Class_Container",
10921093
key.offset: 323,
10931094
key.length: 87,
@@ -1254,6 +1255,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
12541255
},
12551256
{
12561257
key.kind: source.lang.swift.decl.extension,
1258+
key.accessibility: source.lang.swift.accessibility.internal,
12571259
key.name: "MemberToMember_Class_Swift4",
12581260
key.offset: 741,
12591261
key.length: 88,
@@ -1327,6 +1329,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
13271329
},
13281330
{
13291331
key.kind: source.lang.swift.decl.extension,
1332+
key.accessibility: source.lang.swift.accessibility.internal,
13301333
key.name: "MemberToMember_SameContainer_Class_Container",
13311334
key.offset: 958,
13321335
key.length: 105,
@@ -1431,6 +1434,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
14311434
},
14321435
{
14331436
key.kind: source.lang.swift.decl.extension,
1437+
key.accessibility: source.lang.swift.accessibility.internal,
14341438
key.name: "MemberToMember_SameName_Class_Swift4",
14351439
key.offset: 1253,
14361440
key.length: 93,
@@ -1504,6 +1508,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
15041508
},
15051509
{
15061510
key.kind: source.lang.swift.decl.extension,
1511+
key.accessibility: source.lang.swift.accessibility.internal,
15071512
key.name: "GlobalToMember_Typedef_Container",
15081513
key.offset: 1627,
15091514
key.length: 82,
@@ -1641,6 +1646,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
16411646
},
16421647
{
16431648
key.kind: source.lang.swift.decl.extension,
1649+
key.accessibility: source.lang.swift.accessibility.internal,
16441650
key.name: "MemberToMember_Typedef_Swift4",
16451651
key.offset: 2045,
16461652
key.length: 83,
@@ -1700,6 +1706,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
17001706
},
17011707
{
17021708
key.kind: source.lang.swift.decl.extension,
1709+
key.accessibility: source.lang.swift.accessibility.internal,
17031710
key.name: "MemberToMember_SameContainer_Typedef_Container",
17041711
key.offset: 2259,
17051712
key.length: 100,
@@ -1790,6 +1797,7 @@ extension MemberToMember_SameName_Typedef_Swift4 {
17901797
},
17911798
{
17921799
key.kind: source.lang.swift.decl.extension,
1800+
key.accessibility: source.lang.swift.accessibility.internal,
17931801
key.name: "MemberToMember_SameName_Typedef_Swift4",
17941802
key.offset: 2553,
17951803
key.length: 88,

0 commit comments

Comments
 (0)