Skip to content

Commit 47554c1

Browse files
author
Nathan Hawes
authored
Merge pull request #31942 from rockbruno/allelementsmatter
[SourceKit][SR-12837] Add effective access level of references
2 parents 403b2bf + 346771f commit 47554c1

26 files changed

+4390
-159
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
public class ExportedClass {}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@_exported import Exported
2+
public class ModuleClass {}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
key.is_dynamic: 1,
3939
key.is_implicit: 1
4040
}
41-
]
41+
],
42+
key.effective_access: source.decl.effective_access.internal
4243
},
4344
{
4445
key.kind: source.lang.swift.ref.class,
@@ -47,7 +48,8 @@
4748
key.line: 2,
4849
key.column: 9
4950
}
50-
]
51+
],
52+
key.effective_access: source.decl.effective_access.internal
5153
}
5254
]
5355
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
key.is_dynamic: 1,
3939
key.is_implicit: 1
4040
}
41-
]
41+
],
42+
key.effective_access: source.decl.effective_access.internal
4243
},
4344
{
4445
key.kind: source.lang.swift.ref.class,
@@ -47,7 +48,8 @@
4748
key.line: 2,
4849
key.column: 9
4950
}
50-
]
51+
],
52+
key.effective_access: source.decl.effective_access.internal
5153
}
5254
]
5355
}

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

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
{
2626
key.kind: source.lang.swift.decl.class,
2727
key.name: "Empty",
28-
key.usr: "s:11test_module5EmptyC"
28+
key.usr: "s:11test_module5EmptyC",
29+
key.effective_access: source.decl.effective_access.public
2930
},
3031
{
3132
key.kind: source.lang.swift.decl.class,
@@ -49,7 +50,8 @@
4950
key.is_dynamic: 1,
5051
key.is_implicit: 1
5152
}
52-
]
53+
],
54+
key.effective_access: source.decl.effective_access.public
5355
},
5456
{
5557
key.kind: source.lang.swift.decl.var.instance,
@@ -68,14 +70,17 @@
6870
key.is_dynamic: 1,
6971
key.is_implicit: 1
7072
}
71-
]
73+
],
74+
key.effective_access: source.decl.effective_access.public
7275
},
7376
{
7477
key.kind: source.lang.swift.decl.function.constructor,
7578
key.name: "init(a:b:)",
76-
key.usr: "s:11test_module7TwoIntsC1a1bACSi_Sitcfc"
79+
key.usr: "s:11test_module7TwoIntsC1a1bACSi_Sitcfc",
80+
key.effective_access: source.decl.effective_access.public
7781
}
78-
]
82+
],
83+
key.effective_access: source.decl.effective_access.public
7984
},
8085
{
8186
key.kind: source.lang.swift.decl.class,
@@ -99,14 +104,17 @@
99104
key.usr: "s:11test_module16ComputedPropertyC5valueSivs",
100105
key.is_dynamic: 1
101106
}
102-
]
107+
],
108+
key.effective_access: source.decl.effective_access.public
103109
}
104-
]
110+
],
111+
key.effective_access: source.decl.effective_access.public
105112
},
106113
{
107114
key.kind: source.lang.swift.decl.protocol,
108115
key.name: "Prot1",
109-
key.usr: "s:11test_module5Prot1P"
116+
key.usr: "s:11test_module5Prot1P",
117+
key.effective_access: source.decl.effective_access.public
110118
},
111119
{
112120
key.kind: source.lang.swift.decl.protocol,
@@ -118,17 +126,20 @@
118126
key.name: "Prot1",
119127
key.usr: "s:11test_module5Prot1P"
120128
}
121-
]
129+
],
130+
key.effective_access: source.decl.effective_access.public
122131
},
123132
{
124133
key.kind: source.lang.swift.decl.protocol,
125134
key.name: "Prot3",
126-
key.usr: "s:11test_module5Prot3P"
135+
key.usr: "s:11test_module5Prot3P",
136+
key.effective_access: source.decl.effective_access.public
127137
},
128138
{
129139
key.kind: source.lang.swift.decl.class,
130140
key.name: "C2",
131-
key.usr: "s:11test_module2C2C"
141+
key.usr: "s:11test_module2C2C",
142+
key.effective_access: source.decl.effective_access.public
132143
},
133144
{
134145
key.kind: source.lang.swift.decl.extension.class,
@@ -155,7 +166,8 @@
155166
{
156167
key.kind: source.lang.swift.decl.function.free,
157168
key.name: "globalFunc()",
158-
key.usr: "s:11test_module10globalFuncyyF"
169+
key.usr: "s:11test_module10globalFuncyyF",
170+
key.effective_access: source.decl.effective_access.public
159171
},
160172
{
161173
key.kind: source.lang.swift.decl.extension.class,

0 commit comments

Comments
 (0)