Skip to content

Commit 9b05823

Browse files
committed
Remove accessors and add PW tests
1 parent f000639 commit 9b05823

13 files changed

+1606
-516
lines changed

test/SourceKit/Indexing/Inputs/implicit-vis/a.index.response

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,15 @@
2828
key.line: 2,
2929
key.column: 6,
3030
key.is_dynamic: 1,
31-
key.is_implicit: 1,
32-
key.effective_access: source.decl.effective_access.internal
31+
key.is_implicit: 1
3332
},
3433
{
3534
key.kind: source.lang.swift.decl.function.accessor.setter,
3635
key.usr: "s:12implicit_vis1AC1bAA1BCvs",
3736
key.line: 2,
3837
key.column: 6,
3938
key.is_dynamic: 1,
40-
key.is_implicit: 1,
41-
key.effective_access: source.decl.effective_access.internal
39+
key.is_implicit: 1
4240
}
4341
],
4442
key.effective_access: source.decl.effective_access.internal

test/SourceKit/Indexing/Inputs/implicit-vis/b.index.response

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,15 @@
2828
key.line: 2,
2929
key.column: 6,
3030
key.is_dynamic: 1,
31-
key.is_implicit: 1,
32-
key.effective_access: source.decl.effective_access.internal
31+
key.is_implicit: 1
3332
},
3433
{
3534
key.kind: source.lang.swift.decl.function.accessor.setter,
3635
key.usr: "s:12implicit_vis1BC1aAA1ACvs",
3736
key.line: 2,
3837
key.column: 6,
3938
key.is_dynamic: 1,
40-
key.is_implicit: 1,
41-
key.effective_access: source.decl.effective_access.internal
39+
key.is_implicit: 1
4240
}
4341
],
4442
key.effective_access: source.decl.effective_access.internal

test/SourceKit/Indexing/Inputs/test_module.index.response

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,13 @@
4242
key.kind: source.lang.swift.decl.function.accessor.getter,
4343
key.usr: "s:11test_module7TwoIntsC1xSivg",
4444
key.is_dynamic: 1,
45-
key.is_implicit: 1,
46-
key.effective_access: source.decl.effective_access.public
45+
key.is_implicit: 1
4746
},
4847
{
4948
key.kind: source.lang.swift.decl.function.accessor.setter,
5049
key.usr: "s:11test_module7TwoIntsC1xSivs",
5150
key.is_dynamic: 1,
52-
key.is_implicit: 1,
53-
key.effective_access: source.decl.effective_access.public
51+
key.is_implicit: 1
5452
}
5553
],
5654
key.effective_access: source.decl.effective_access.public
@@ -64,15 +62,13 @@
6462
key.kind: source.lang.swift.decl.function.accessor.getter,
6563
key.usr: "s:11test_module7TwoIntsC1ySivg",
6664
key.is_dynamic: 1,
67-
key.is_implicit: 1,
68-
key.effective_access: source.decl.effective_access.public
65+
key.is_implicit: 1
6966
},
7067
{
7168
key.kind: source.lang.swift.decl.function.accessor.setter,
7269
key.usr: "s:11test_module7TwoIntsC1ySivs",
7370
key.is_dynamic: 1,
74-
key.is_implicit: 1,
75-
key.effective_access: source.decl.effective_access.public
71+
key.is_implicit: 1
7672
}
7773
],
7874
key.effective_access: source.decl.effective_access.public
@@ -100,15 +96,13 @@
10096
key.kind: source.lang.swift.decl.function.accessor.getter,
10197
key.name: "getter:value",
10298
key.usr: "s:11test_module16ComputedPropertyC5valueSivg",
103-
key.is_dynamic: 1,
104-
key.effective_access: source.decl.effective_access.public
99+
key.is_dynamic: 1
105100
},
106101
{
107102
key.kind: source.lang.swift.decl.function.accessor.setter,
108103
key.name: "setter:value",
109104
key.usr: "s:11test_module16ComputedPropertyC5valueSivs",
110-
key.is_dynamic: 1,
111-
key.effective_access: source.decl.effective_access.public
105+
key.is_dynamic: 1
112106
}
113107
],
114108
key.effective_access: source.decl.effective_access.public

test/SourceKit/Indexing/index.swift.response

Lines changed: 23 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@
2020
key.usr: <usr>,
2121
key.line: 4,
2222
key.column: 5,
23-
key.is_implicit: 1,
24-
key.effective_access: source.decl.effective_access.internal
23+
key.is_implicit: 1
2524
},
2625
{
2726
key.kind: source.lang.swift.decl.function.accessor.setter,
2827
key.usr: <usr>,
2928
key.line: 4,
3029
key.column: 5,
31-
key.is_implicit: 1,
32-
key.effective_access: source.decl.effective_access.internal
30+
key.is_implicit: 1
3331
}
3432
],
3533
key.effective_access: source.decl.effective_access.internal
@@ -69,17 +67,15 @@
6967
key.line: 8,
7068
key.column: 7,
7169
key.is_dynamic: 1,
72-
key.is_implicit: 1,
73-
key.effective_access: source.decl.effective_access.internal
70+
key.is_implicit: 1
7471
},
7572
{
7673
key.kind: source.lang.swift.decl.function.accessor.setter,
7774
key.usr: <usr>,
7875
key.line: 8,
7976
key.column: 7,
8077
key.is_dynamic: 1,
81-
key.is_implicit: 1,
82-
key.effective_access: source.decl.effective_access.internal
78+
key.is_implicit: 1
8379
}
8480
],
8581
key.effective_access: source.decl.effective_access.internal
@@ -500,8 +496,7 @@
500496
key.usr: <usr>,
501497
key.line: 52,
502498
key.column: 18,
503-
key.is_dynamic: 1,
504-
key.effective_access: source.decl.effective_access.internal
499+
key.is_dynamic: 1
505500
}
506501
],
507502
key.effective_access: source.decl.effective_access.internal
@@ -588,16 +583,14 @@
588583
key.usr: <usr>,
589584
key.line: 57,
590585
key.column: 5,
591-
key.is_implicit: 1,
592-
key.effective_access: source.decl.effective_access.internal
586+
key.is_implicit: 1
593587
},
594588
{
595589
key.kind: source.lang.swift.decl.function.accessor.setter,
596590
key.usr: <usr>,
597591
key.line: 57,
598592
key.column: 5,
599-
key.is_implicit: 1,
600-
key.effective_access: source.decl.effective_access.internal
593+
key.is_implicit: 1
601594
}
602595
],
603596
key.effective_access: source.decl.effective_access.internal
@@ -629,17 +622,15 @@
629622
key.usr: <usr>,
630623
key.line: 61,
631624
key.column: 5,
632-
key.is_dynamic: 1,
633-
key.effective_access: source.decl.effective_access.internal
625+
key.is_dynamic: 1
634626
},
635627
{
636628
key.kind: source.lang.swift.decl.function.accessor.setter,
637629
key.name: "setter:value",
638630
key.usr: <usr>,
639631
key.line: 65,
640632
key.column: 5,
641-
key.is_dynamic: 1,
642-
key.effective_access: source.decl.effective_access.internal
633+
key.is_dynamic: 1
643634
}
644635
],
645636
key.effective_access: source.decl.effective_access.internal
@@ -664,8 +655,7 @@
664655
key.usr: <usr>,
665656
key.line: 70,
666657
key.column: 22,
667-
key.is_dynamic: 1,
668-
key.effective_access: source.decl.effective_access.internal
658+
key.is_dynamic: 1
669659
}
670660
],
671661
key.effective_access: source.decl.effective_access.internal
@@ -839,8 +829,7 @@
839829
key.usr: <usr>,
840830
key.line: 82,
841831
key.column: 5,
842-
key.is_dynamic: 1,
843-
key.effective_access: source.decl.effective_access.internal
832+
key.is_dynamic: 1
844833
},
845834
{
846835
key.kind: source.lang.swift.decl.function.accessor.setter,
@@ -858,8 +847,7 @@
858847
key.column: 8,
859848
key.receiver_usr: "s:Si"
860849
}
861-
],
862-
key.effective_access: source.decl.effective_access.internal
850+
]
863851
},
864852
{
865853
key.kind: source.lang.swift.ref.struct,
@@ -1057,8 +1045,7 @@
10571045
key.line: 107,
10581046
key.column: 12
10591047
}
1060-
],
1061-
key.effective_access: source.decl.effective_access.internal
1048+
]
10621049
}
10631050
],
10641051
key.effective_access: source.decl.effective_access.internal
@@ -1437,17 +1424,15 @@
14371424
key.line: 151,
14381425
key.column: 7,
14391426
key.is_dynamic: 1,
1440-
key.is_implicit: 1,
1441-
key.effective_access: source.decl.effective_access.internal
1427+
key.is_implicit: 1
14421428
},
14431429
{
14441430
key.kind: source.lang.swift.decl.function.accessor.setter,
14451431
key.usr: <usr>,
14461432
key.line: 151,
14471433
key.column: 7,
14481434
key.is_dynamic: 1,
1449-
key.is_implicit: 1,
1450-
key.effective_access: source.decl.effective_access.internal
1435+
key.is_implicit: 1
14511436
},
14521437
{
14531438
key.kind: source.lang.swift.decl.function.accessor.willset,
@@ -1463,8 +1448,7 @@
14631448
key.line: 153,
14641449
key.column: 7
14651450
}
1466-
],
1467-
key.effective_access: source.decl.effective_access.less_than_fileprivate
1451+
]
14681452
},
14691453
{
14701454
key.kind: source.lang.swift.decl.function.accessor.didset,
@@ -1480,8 +1464,7 @@
14801464
key.line: 156,
14811465
key.column: 7
14821466
}
1483-
],
1484-
key.effective_access: source.decl.effective_access.less_than_fileprivate
1467+
]
14851468
}
14861469
],
14871470
key.effective_access: source.decl.effective_access.internal
@@ -1516,25 +1499,22 @@
15161499
key.usr: <usr>,
15171500
key.line: 165,
15181501
key.column: 5,
1519-
key.is_dynamic: 1,
1520-
key.effective_access: source.decl.effective_access.internal
1502+
key.is_dynamic: 1
15211503
},
15221504
{
15231505
key.kind: source.lang.swift.decl.function.accessor.setter,
15241506
key.name: "setter:S1",
15251507
key.usr: <usr>,
15261508
key.line: 168,
15271509
key.column: 5,
1528-
key.is_dynamic: 1,
1529-
key.effective_access: source.decl.effective_access.internal
1510+
key.is_dynamic: 1
15301511
},
15311512
{
15321513
key.kind: source.lang.swift.decl.function.accessor.didset,
15331514
key.name: "didSet:S1",
15341515
key.usr: <usr>,
15351516
key.line: 170,
1536-
key.column: 5,
1537-
key.effective_access: source.decl.effective_access.less_than_fileprivate
1517+
key.column: 5
15381518
}
15391519
],
15401520
key.effective_access: source.decl.effective_access.internal
@@ -1577,26 +1557,23 @@
15771557
key.usr: <usr>,
15781558
key.line: 177,
15791559
key.column: 5,
1580-
key.is_dynamic: 1,
1581-
key.effective_access: source.decl.effective_access.internal
1560+
key.is_dynamic: 1
15821561
},
15831562
{
15841563
key.kind: source.lang.swift.decl.function.accessor.setter,
15851564
key.name: "setter:S1",
15861565
key.usr: <usr>,
15871566
key.line: 178,
15881567
key.column: 5,
1589-
key.is_dynamic: 1,
1590-
key.effective_access: source.decl.effective_access.internal
1568+
key.is_dynamic: 1
15911569
},
15921570
{
15931571
key.kind: source.lang.swift.decl.function.accessor.getter,
15941572
key.name: "getter:S1",
15951573
key.usr: <usr>,
15961574
key.line: 179,
15971575
key.column: 5,
1598-
key.is_dynamic: 1,
1599-
key.effective_access: source.decl.effective_access.internal
1576+
key.is_dynamic: 1
16001577
}
16011578
],
16021579
key.effective_access: source.decl.effective_access.internal

test/SourceKit/Indexing/index_bad_modulename.swift.response

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,14 @@
6161
key.usr: "s:4main1vSo8NSObjectCSgvg",
6262
key.line: 9,
6363
key.column: 5,
64-
key.is_implicit: 1,
65-
key.effective_access: source.decl.effective_access.internal
64+
key.is_implicit: 1
6665
},
6766
{
6867
key.kind: source.lang.swift.decl.function.accessor.setter,
6968
key.usr: "s:4main1vSo8NSObjectCSgvs",
7069
key.line: 9,
7170
key.column: 5,
72-
key.is_implicit: 1,
73-
key.effective_access: source.decl.effective_access.internal
71+
key.is_implicit: 1
7472
}
7573
],
7674
key.effective_access: source.decl.effective_access.internal

test/SourceKit/Indexing/index_big_array.swift.response

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@
2020
key.usr: "s:9big_array15gCubeVertexDataSaySfGvg",
2121
key.line: 1,
2222
key.column: 5,
23-
key.is_implicit: 1,
24-
key.effective_access: source.decl.effective_access.internal
23+
key.is_implicit: 1
2524
},
2625
{
2726
key.kind: source.lang.swift.decl.function.accessor.setter,
2827
key.usr: "s:9big_array15gCubeVertexDataSaySfGvs",
2928
key.line: 1,
3029
key.column: 5,
31-
key.is_implicit: 1,
32-
key.effective_access: source.decl.effective_access.internal
30+
key.is_implicit: 1
3331
}
3432
],
3533
key.effective_access: source.decl.effective_access.internal

test/SourceKit/Indexing/index_constructors.swift.response

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,15 @@
5151
key.line: 9,
5252
key.column: 7,
5353
key.is_dynamic: 1,
54-
key.is_implicit: 1,
55-
key.effective_access: source.decl.effective_access.internal
54+
key.is_implicit: 1
5655
},
5756
{
5857
key.kind: source.lang.swift.decl.function.accessor.setter,
5958
key.usr: "s:18index_constructors11HorseObjectC4nameXevs",
6059
key.line: 9,
6160
key.column: 7,
6261
key.is_dynamic: 1,
63-
key.is_implicit: 1,
64-
key.effective_access: source.decl.effective_access.internal
62+
key.is_implicit: 1
6563
}
6664
],
6765
key.effective_access: source.decl.effective_access.internal

0 commit comments

Comments
 (0)