averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18772 from jrose-apple/access-denied

Browse Source 
Stop printing access on extensions and protocol requirements
This commit is contained in:
Jordan Rose
2018-08-16 18:24:58 -07:00
committed by GitHub
parent f1f056cb4b 5a8cbe4503
commit dd8b37ee9f
5 changed files with 876 additions and 956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/AST/ASTPrinter.cpp
View File

@@ -90,6 +90,8 @@ PrintOptions PrintOptions::printTextualInterfaceFile() {
// the default to 'public' and mark the 'internal' things.
result.PrintAccess = true;
result.ExcludeAttrList.push_back(DAK_AccessControl);
// FIXME: We'll need the actual default parameter expression.
result.PrintDefaultParameterPlaceholder = false;
@@ -494,7 +496,10 @@ class PrintAST : public ASTVisitor<PrintAST> {
void printAccess(const ValueDecl *D) {
if (!Options.PrintAccess || !D->hasAccess() ||
D->getAttrs().hasAttribute<AccessControlAttr>())
isa<ProtocolDecl>(D->getDeclContext()))
return;
if (D->getAttrs().hasAttribute<AccessControlAttr>() &&
!llvm::is_contained(Options.ExcludeAttrList, DAK_AccessControl))
return;
printAccess(D->getFormalAccess());

6
test/IDE/print_synthesized_extensions.swift
View File

@@ -315,13 +315,13 @@ extension S13 : P5 {
// CHECK11-NEXT: }</synthesized>
// CHECK12: <decl:Protocol>public protocol <loc>P6</loc> {
// CHECK12-NEXT: <decl:Func(HasDefault)>public func <loc>foo1()</loc></decl>
// CHECK12-NEXT: <decl:Func>public func <loc>foo2()</loc></decl>
// CHECK12-NEXT: <decl:Func(HasDefault)>func <loc>foo1()</loc></decl>
// CHECK12-NEXT: <decl:Func>func <loc>foo2()</loc></decl>
// CHECK12-NEXT: }</decl>
// CHECK13: <decl:Protocol>public protocol <loc>P7</loc> {
// CHECK13-NEXT: <decl:AssociatedType>associatedtype <loc>T1</loc></decl>
// CHECK13-NEXT: <decl:Func(HasDefault)>public func <loc>f1(<decl:Param>t: <ref:GenericTypeParam>Self</ref>.T1</decl>)</loc></decl>
// CHECK13-NEXT: <decl:Func(HasDefault)>func <loc>f1(<decl:Param>t: <ref:GenericTypeParam>Self</ref>.T1</decl>)</loc></decl>
// CHECK13-NEXT: }</decl>
// CHECK13: <decl:Extension>extension <loc><ref:Protocol>P7</ref></loc> {

3
test/ModuleInterface/access-filter.swift
View File

@@ -60,8 +60,7 @@ extension PublicProto {
@usableFromInline internal func ufiMethod() {}
} // CHECK: {{^[}]$}}
// FIXME: We shouldn't print access on extensions in textual interface files.
// CHECK: {{^}}public extension PublicProto {{[{]$}}
// CHECK: {{^}}extension PublicProto {{[{]$}}
public extension PublicProto {
// CHECK: public func publicExtPublicMethod(){{$}}
func publicExtPublicMethod() {}

1808
test/SourceKit/InterfaceGen/gen_clang_module.swift.response
View File

File diff suppressed because it is too large Load Diff

8
test/attr/accessibility_print.swift
View File

@@ -122,9 +122,9 @@ public enum DC_PublicEnum {
private protocol EA_PrivateProtocol {
// CHECK: {{^}} associatedtype Foo
associatedtype Foo
// CHECK: fileprivate var Bar
// CHECK: {{^}} var Bar
var Bar: Int { get }
// CHECK: fileprivate func baz()
// CHECK: {{^}} func baz()
func baz()
} // CHECK: {{^[}]}}
@@ -132,9 +132,9 @@ private protocol EA_PrivateProtocol {
public protocol EB_PublicProtocol {
// CHECK: {{^}} associatedtype Foo
associatedtype Foo
// CHECK: public var Bar
// CHECK: {{^}} var Bar
var Bar: Int { get }
// CHECK: public func baz()
// CHECK: {{^}} func baz()
func baz()
} // CHECK: {{^[}]}}