Skip to content

[SourceKit] Add accessibility in extension structure (SR-4823) #11260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 31, 2017
Merged

[SourceKit] Add accessibility in extension structure (SR-4823) #11260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edd8ceb
[SourceKit] Add accessibility in extension structure (SR-4823)
marcelofabri Jul 29, 2017
86d9e91
Only add accessibility if explicit
marcelofabri Jul 31, 2017
c4688ed
PR feedback
marcelofabri Jul 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions test/SourceKit/DocumentStructure/Inputs/access.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,12 @@ extension PrivAccess {
private extension PubAccess {
func privExtFunc() {}
}
internal extension DefAccess {
func internalExtFunc() {}
}
public extension PubAccess {
func publicExtFunc() {}
}

typealias defAlias = Int
public typealias pubAlias = Int
Expand Down
67 changes: 58 additions & 9 deletions test/SourceKit/DocumentStructure/access_parse.swift.response
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
key.offset: 0,
key.length: 1758,
key.length: 1876,
key.diagnostic_stage: source.diagnostic.stage.swift.parse,
key.substructure: [
{
Expand Down Expand Up @@ -630,6 +630,7 @@
},
{
key.kind: source.lang.swift.decl.extension,
key.accessibility: source.lang.swift.accessibility.private,
key.name: "PubAccess",
key.offset: 1584,
key.length: 47,
Expand All @@ -651,40 +652,88 @@
}
]
},
{
key.kind: source.lang.swift.decl.extension,
key.accessibility: source.lang.swift.accessibility.internal,
key.name: "DefAccess",
key.offset: 1641,
key.length: 51,
key.nameoffset: 1651,
key.namelength: 9,
key.bodyoffset: 1662,
key.bodylength: 29,
key.substructure: [
{
key.kind: source.lang.swift.decl.function.method.instance,
key.accessibility: source.lang.swift.accessibility.internal,
key.name: "internalExtFunc()",
key.offset: 1665,
key.length: 25,
key.nameoffset: 1670,
key.namelength: 17,
key.bodyoffset: 1689,
key.bodylength: 0
}
]
},
{
key.kind: source.lang.swift.decl.extension,
key.accessibility: source.lang.swift.accessibility.public,
key.name: "PubAccess",
key.offset: 1700,
key.length: 49,
key.nameoffset: 1710,
key.namelength: 9,
key.bodyoffset: 1721,
key.bodylength: 27,
key.substructure: [
{
key.kind: source.lang.swift.decl.function.method.instance,
key.accessibility: source.lang.swift.accessibility.public,
key.name: "publicExtFunc()",
key.offset: 1724,
key.length: 23,
key.nameoffset: 1729,
key.namelength: 15,
key.bodyoffset: 1746,
key.bodylength: 0
}
]
},
{
key.kind: source.lang.swift.decl.typealias,
key.accessibility: source.lang.swift.accessibility.internal,
key.name: "defAlias",
key.offset: 1633,
key.offset: 1751,
key.length: 24,
key.nameoffset: 1643,
key.nameoffset: 1761,
key.namelength: 8
},
{
key.kind: source.lang.swift.decl.typealias,
key.accessibility: source.lang.swift.accessibility.public,
key.name: "pubAlias",
key.offset: 1665,
key.offset: 1783,
key.length: 24,
key.nameoffset: 1675,
key.nameoffset: 1793,
key.namelength: 8
},
{
key.kind: source.lang.swift.decl.typealias,
key.accessibility: source.lang.swift.accessibility.private,
key.name: "privAlias",
key.offset: 1698,
key.offset: 1816,
key.length: 25,
key.nameoffset: 1708,
key.nameoffset: 1826,
key.namelength: 9
},
{
key.kind: source.lang.swift.decl.typealias,
key.accessibility: source.lang.swift.accessibility.internal,
key.name: "intAlias",
key.offset: 1733,
key.offset: 1851,
key.length: 24,
key.nameoffset: 1743,
key.nameoffset: 1861,
key.namelength: 8
}
]
Expand Down
13 changes: 12 additions & 1 deletion tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,13 +912,21 @@ static UIdent getAccessibilityUID(Accessibility Access) {
llvm_unreachable("Unhandled Accessibility in switch.");
}

static Accessibility inferDefaultAccessibility(const ExtensionDecl *ED) {
static Optional<Accessibility> getAccessibilityStrictly(const ExtensionDecl *ED) {
if (ED->hasDefaultAccessibility())
return ED->getDefaultAccessibility();

// Check if the decl has an explicit accessibility attribute.
if (auto *AA = ED->getAttrs().getAttribute<AccessibilityAttr>())
return AA->getAccess();

return None;
}

static Accessibility inferDefaultAccessibility(const ExtensionDecl *ED) {
if (auto StrictAccess = getAccessibilityStrictly(ED))
return StrictAccess.getValue();

// Assume "internal", which is the most common thing anyway.
return Accessibility::Internal;
}
Expand Down Expand Up @@ -1025,6 +1033,9 @@ class SwiftDocumentStructureWalker: public ide::SyntaxModelWalker {
if (Node.Kind != SyntaxStructureKind::Parameter) {
if (auto *VD = dyn_cast_or_null<ValueDecl>(Node.Dcl)) {
AccessLevel = getAccessibilityUID(inferAccessibility(VD));
} else if (auto *ED = dyn_cast_or_null<ExtensionDecl>(Node.Dcl)) {
if (auto StrictAccess = getAccessibilityStrictly(ED))
AccessLevel = getAccessibilityUID(StrictAccess.getValue());
}
if (auto *ASD = dyn_cast_or_null<AbstractStorageDecl>(Node.Dcl)) {
Optional<Accessibility> SetAccess = inferSetterAccessibility(ASD);
Expand Down