Tweak diagnostic for a high-access member in a low-access extension

jrose-apple · jrose-apple · commit 1f06cd7e6d31 · 2019-01-28T18:24:12.000-08:00
Before: declaring a public instance method in a private extension
After: 'public' modifier conflicts with extension's default access of
       'private'
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
@@ -1210,9 +1210,10 @@ WARNING(access_control_setter_redundant,none,
       "%1",
       (AccessLevel, DescriptiveDeclKind, AccessLevel))
 WARNING(access_control_ext_member_more,none,
-    "declaring %select{%error|a fileprivate|an internal|a public|open}0 %1 in "
-    "%select{a private|a fileprivate|an internal|a public|%error}2 extension",
-    (AccessLevel, DescriptiveDeclKind, AccessLevel))
+    "'%select{%error|fileprivate|internal|public|open}0' modifier conflicts "
+    "with extension's default access of "
+    "'%select{private|fileprivate|internal|public|%error}1'",
+    (AccessLevel, AccessLevel))
 WARNING(access_control_ext_member_redundant,none,
     "'%select{%error|fileprivate|internal|public|%error}0' modifier is redundant "
     "for %1 declared in %select{a private (equivalent to fileprivate)|a fileprivate"
diff --git a/lib/Sema/TypeCheckAttr.cpp b/lib/Sema/TypeCheckAttr.cpp
@@ -1640,7 +1640,6 @@ void AttributeChecker::visitAccessControlAttr(AccessControlAttr *attr) {
         auto diag = TC.diagnose(attr->getLocation(),
                                 diag::access_control_ext_member_more,
                                 attr->getAccess(),
-                                D->getDescriptiveKind(),
                                 extAttr->getAccess());
         swift::fixItAccess(diag, cast<ValueDecl>(D), defaultAccess, false,
                            true);
diff --git a/test/ClangImporter/objc_override.swift b/test/ClangImporter/objc_override.swift
@@ -116,7 +116,6 @@ class MyHashableNSObject: NSObject {
   }
 }
 
-
 // FIXME: Remove -verify-ignore-unknown.
 // <unknown>:0: error: unexpected note produced: overridden declaration is here
 // <unknown>:0: error: unexpected note produced: setter for 'boolProperty' declared here
diff --git a/test/Compatibility/accessibility.swift b/test/Compatibility/accessibility.swift
@@ -80,17 +80,17 @@ public extension PublicStruct {
   private func extImplPublic() {}
 }
 internal extension PublicStruct {
-  public func extMemberInternal() {} // expected-warning {{declaring a public instance method in an internal extension}} {{3-10=}}
+  public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{3-10=}}
   fileprivate func extFuncInternal() {}
   private func extImplInternal() {}
 }
 fileprivate extension PublicStruct {
-  public func extMemberFilePrivate() {} // expected-warning {{declaring a public instance method in a fileprivate extension}} {{3-10=}}
+  public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{3-10=}}
   fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}
   private func extImplFilePrivate() {}
 }
 private extension PublicStruct {
-  public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}
+  public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}
   fileprivate func extFuncPrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a private (equivalent to fileprivate) extension}} {{3-15=}}
   private func extImplPrivate() {}
 }
@@ -100,17 +100,17 @@ public extension InternalStruct { // expected-error {{extension of internal stru
   private func extImplPublic() {}
 }
 internal extension InternalStruct {
-  public func extMemberInternal() {} // expected-warning {{declaring a public instance method in an internal extension}} {{3-10=}}
+  public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{3-10=}}
   fileprivate func extFuncInternal() {}
   private func extImplInternal() {}
 }
 fileprivate extension InternalStruct {
-  public func extMemberFilePrivate() {} // expected-warning {{declaring a public instance method in a fileprivate extension}} {{3-10=}}
+  public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{3-10=}}
   fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}
   private func extImplFilePrivate() {}
 }
 private extension InternalStruct {
-  public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}
+  public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}
   fileprivate func extFuncPrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a private (equivalent to fileprivate) extension}} {{3-15=}}
   private func extImplPrivate() {}
 }
@@ -120,17 +120,17 @@ public extension FilePrivateStruct { // expected-error {{extension of fileprivat
   private func extImplPublic() {}
 }
 internal extension FilePrivateStruct { // expected-error {{extension of fileprivate struct cannot be declared internal}} {{1-10=}}
-  public func extMemberInternal() {} // expected-warning {{declaring a public instance method in an internal extension}} {{3-10=}}
+  public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{3-10=}}
   fileprivate func extFuncInternal() {}
   private func extImplInternal() {}
 }
 fileprivate extension FilePrivateStruct {
-  public func extMemberFilePrivate() {} // expected-warning {{declaring a public instance method in a fileprivate extension}} {{3-10=}}
+  public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{3-10=}}
   fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}
   private func extImplFilePrivate() {}
 }
 private extension FilePrivateStruct {
-  public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}
+  public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}
   fileprivate func extFuncPrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a private (equivalent to fileprivate) extension}} {{3-15=}}
   private func extImplPrivate() {}
 }
@@ -140,17 +140,17 @@ public extension PrivateStruct { // expected-error {{extension of private struct
   private func extImplPublic() {}
 }
 internal extension PrivateStruct { // expected-error {{extension of private struct cannot be declared internal}} {{1-10=}}
-  public func extMemberInternal() {} // expected-warning {{declaring a public instance method in an internal extension}} {{3-10=}}
+  public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{3-10=}}
   fileprivate func extFuncInternal() {}
   private func extImplInternal() {}
 }
 fileprivate extension PrivateStruct { // expected-error {{extension of private struct cannot be declared fileprivate}} {{1-13=}}
-  public func extMemberFilePrivate() {} // expected-warning {{declaring a public instance method in a fileprivate extension}} {{3-10=}}
+  public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{3-10=}}
   fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}
   private func extImplFilePrivate() {}
 }
 private extension PrivateStruct {
-  public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}
+  public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}
   fileprivate func extFuncPrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a private (equivalent to fileprivate) extension}} {{3-15=}}
   private func extImplPrivate() {}
 }
@@ -175,10 +175,10 @@ public class Base {
 
 
 public extension Base {
-  open func extMemberPublic() {} // expected-warning {{declaring open instance method in a public extension}}
+  open func extMemberPublic() {} // expected-warning {{'open' modifier conflicts with extension's default access of 'public'}}
 }
 internal extension Base {
-  open func extMemberInternal() {} // expected-warning {{declaring open instance method in an internal extension}}
+  open func extMemberInternal() {} // expected-warning {{'open' modifier conflicts with extension's default access of 'internal'}}
 }
 
 public class PublicSub: Base {
diff --git a/test/SILGen/accessibility_warnings.swift b/test/SILGen/accessibility_warnings.swift
@@ -66,34 +66,34 @@ public extension PublicStruct {
 
 internal extension PublicStruct {
   // CHECK-DAG: sil hidden [ossa] @$s22accessibility_warnings12PublicStructV17extMemberInternalyyF
-  public func extMemberInternal() {} // expected-warning {{declaring a public instance method in an internal extension}} {{3-10=}}
+  public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{3-10=}}
   // CHECK-DAG: sil private [ossa] @$s22accessibility_warnings12PublicStructV15extImplInternal33_5D2F2E026754A901C0FF90C404896D02LLyyF
   private func extImplInternal() {}
 }
 private extension PublicStruct {
   // CHECK-DAG: sil private [ossa] @$s22accessibility_warnings12PublicStructV16extMemberPrivate33_5D2F2E026754A901C0FF90C404896D02LLyyF
-  public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}
+  public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}
   // CHECK-DAG: sil private [ossa] @$s22accessibility_warnings12PublicStructV14extImplPrivate33_5D2F2E026754A901C0FF90C404896D02LLyyF
   private func extImplPrivate() {}
 }
 
 internal extension InternalStruct {
   // CHECK-DAG: sil hidden [ossa] @$s22accessibility_warnings14InternalStructV09extMemberC0yyF
-  public func extMemberInternal() {} // expected-warning {{declaring a public instance method in an internal extension}} {{3-10=}}
+  public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{3-10=}}
   // CHECK-DAG: sil private [ossa] @$s22accessibility_warnings14InternalStructV07extImplC033_5D2F2E026754A901C0FF90C404896D02LLyyF
   private func extImplInternal() {}
 }
 private extension InternalStruct {
   // CHECK-DAG: sil private [ossa] @$s22accessibility_warnings14InternalStructV16extMemberPrivate33_5D2F2E026754A901C0FF90C404896D02LLyyF
-  public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}
+  public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}
   // CHECK-DAG: sil private [ossa] @$s22accessibility_warnings14InternalStructV14extImplPrivate33_5D2F2E026754A901C0FF90C404896D02LLyyF
   private func extImplPrivate() {}
 }
 
 
 private extension PrivateStruct {
   // CHECK-DAG: sil private [ossa] @$s22accessibility_warnings13PrivateStruct33_5D2F2E026754A901C0FF90C404896D02LLV09extMemberC0yyF
-  public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}
+  public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}
   // CHECK-DAG: sil private [ossa] @$s22accessibility_warnings13PrivateStruct33_5D2F2E026754A901C0FF90C404896D02LLV07extImplC0yyF
   private func extImplPrivate() {}
 }
diff --git a/test/Sema/accessibility.swift b/test/Sema/accessibility.swift
@@ -79,17 +79,17 @@ public extension PublicStruct {
   private func extImplPublic() {}
 }
 internal extension PublicStruct {
-  public func extMemberInternal() {} // expected-warning {{declaring a public instance method in an internal extension}} {{3-10=}}
+  public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{3-10=}}
   fileprivate func extFuncInternal() {}
   private func extImplInternal() {}
 }
 fileprivate extension PublicStruct {
-  public func extMemberFilePrivate() {} // expected-warning {{declaring a public instance method in a fileprivate extension}} {{3-10=}}
+  public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{3-10=}}
   fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}
   private func extImplFilePrivate() {}
 }
 private extension PublicStruct {
-  public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}
+  public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}
   fileprivate func extFuncPrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a private (equivalent to fileprivate) extension}} {{3-15=}}
   private func extImplPrivate() {}
 }
@@ -99,17 +99,17 @@ public extension InternalStruct { // expected-error {{extension of internal stru
   private func extImplPublic() {}
 }
 internal extension InternalStruct {
-  public func extMemberInternal() {} // expected-warning {{declaring a public instance method in an internal extension}} {{3-10=}}
+  public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{3-10=}}
   fileprivate func extFuncInternal() {}
   private func extImplInternal() {}
 }
 fileprivate extension InternalStruct {
-  public func extMemberFilePrivate() {} // expected-warning {{declaring a public instance method in a fileprivate extension}} {{3-10=}}
+  public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{3-10=}}
   fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}
   private func extImplFilePrivate() {}
 }
 private extension InternalStruct {
-  public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}
+  public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}
   fileprivate func extFuncPrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a private (equivalent to fileprivate) extension}} {{3-15=}}
   private func extImplPrivate() {}
 }
@@ -119,17 +119,17 @@ public extension FilePrivateStruct { // expected-error {{extension of fileprivat
   private func extImplPublic() {}
 }
 internal extension FilePrivateStruct { // expected-error {{extension of fileprivate struct cannot be declared internal}} {{1-10=}}
-  public func extMemberInternal() {} // expected-warning {{declaring a public instance method in an internal extension}} {{3-10=}}
+  public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{3-10=}}
   fileprivate func extFuncInternal() {}
   private func extImplInternal() {}
 }
 fileprivate extension FilePrivateStruct {
-  public func extMemberFilePrivate() {} // expected-warning {{declaring a public instance method in a fileprivate extension}} {{3-10=}}
+  public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{3-10=}}
   fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}
   private func extImplFilePrivate() {}
 }
 private extension FilePrivateStruct {
-  public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}
+  public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}
   fileprivate func extFuncPrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a private (equivalent to fileprivate) extension}} {{3-15=}}
   private func extImplPrivate() {}
 }
@@ -139,17 +139,17 @@ public extension PrivateStruct { // expected-error {{extension of private struct
   private func extImplPublic() {}
 }
 internal extension PrivateStruct { // expected-error {{extension of private struct cannot be declared internal}} {{1-10=}}
-  public func extMemberInternal() {} // expected-warning {{declaring a public instance method in an internal extension}} {{3-10=}}
+  public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{3-10=}}
   fileprivate func extFuncInternal() {}
   private func extImplInternal() {}
 }
 fileprivate extension PrivateStruct { // expected-error {{extension of private struct cannot be declared fileprivate}} {{1-13=}}
-  public func extMemberFilePrivate() {} // expected-warning {{declaring a public instance method in a fileprivate extension}} {{3-10=}}
+  public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{3-10=}}
   fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}
   private func extImplFilePrivate() {}
 }
 private extension PrivateStruct {
-  public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}
+  public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}
   fileprivate func extFuncPrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a private (equivalent to fileprivate) extension}} {{3-15=}}
   private func extImplPrivate() {}
 }
@@ -174,10 +174,10 @@ public class Base {
 
 
 public extension Base {
-  open func extMemberPublic() {} // expected-warning {{declaring open instance method in a public extension}}
+  open func extMemberPublic() {} // expected-warning {{'open' modifier conflicts with extension's default access of 'public'}}
 }
 internal extension Base {
-  open func extMemberInternal() {} // expected-warning {{declaring open instance method in an internal extension}}
+  open func extMemberInternal() {} // expected-warning {{'open' modifier conflicts with extension's default access of 'internal'}}
 }
 
 public class PublicSub: Base {

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,6 @@ class MyHashableNSObject: NSObject {`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
`119`		`-`
`120`	`119`	`// FIXME: Remove -verify-ignore-unknown.`
`121`	`120`	`// <unknown>:0: error: unexpected note produced: overridden declaration is here`
`122`	`121`	`// <unknown>:0: error: unexpected note produced: setter for 'boolProperty' declared here`
Original file line number	Diff line number	Diff line change
`@@ -80,17 +80,17 @@ public extension PublicStruct {`
`80`	`80`	`private func extImplPublic() {}`
`81`	`81`	`}`
`82`	`82`	`internal extension PublicStruct {`
`83`		`- public func extMemberInternal() {} // expected-warning {{declaring a public instance method in an internal extension}} {{3-10=}}`
	`83`	`+ public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{3-10=}}`
`84`	`84`	`fileprivate func extFuncInternal() {}`
`85`	`85`	`private func extImplInternal() {}`
`86`	`86`	`}`
`87`	`87`	`fileprivate extension PublicStruct {`
`88`		`- public func extMemberFilePrivate() {} // expected-warning {{declaring a public instance method in a fileprivate extension}} {{3-10=}}`
	`88`	`+ public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{3-10=}}`
`89`	`89`	`fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}`
`90`	`90`	`private func extImplFilePrivate() {}`
`91`	`91`	`}`
`92`	`92`	`private extension PublicStruct {`
`93`		`- public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}`
	`93`	`+ public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}`
`94`	`94`	`fileprivate func extFuncPrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a private (equivalent to fileprivate) extension}} {{3-15=}}`
`95`	`95`	`private func extImplPrivate() {}`
`96`	`96`	`}`
`@@ -100,17 +100,17 @@ public extension InternalStruct { // expected-error {{extension of internal stru`
`100`	`100`	`private func extImplPublic() {}`
`101`	`101`	`}`
`102`	`102`	`internal extension InternalStruct {`
`103`		`- public func extMemberInternal() {} // expected-warning {{declaring a public instance method in an internal extension}} {{3-10=}}`
	`103`	`+ public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{3-10=}}`
`104`	`104`	`fileprivate func extFuncInternal() {}`
`105`	`105`	`private func extImplInternal() {}`
`106`	`106`	`}`
`107`	`107`	`fileprivate extension InternalStruct {`
`108`		`- public func extMemberFilePrivate() {} // expected-warning {{declaring a public instance method in a fileprivate extension}} {{3-10=}}`
	`108`	`+ public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{3-10=}}`
`109`	`109`	`fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}`
`110`	`110`	`private func extImplFilePrivate() {}`
`111`	`111`	`}`
`112`	`112`	`private extension InternalStruct {`
`113`		`- public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}`
	`113`	`+ public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}`
`114`	`114`	`fileprivate func extFuncPrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a private (equivalent to fileprivate) extension}} {{3-15=}}`
`115`	`115`	`private func extImplPrivate() {}`
`116`	`116`	`}`
`@@ -120,17 +120,17 @@ public extension FilePrivateStruct { // expected-error {{extension of fileprivat`
`120`	`120`	`private func extImplPublic() {}`
`121`	`121`	`}`
`122`	`122`	`internal extension FilePrivateStruct { // expected-error {{extension of fileprivate struct cannot be declared internal}} {{1-10=}}`
`123`		`- public func extMemberInternal() {} // expected-warning {{declaring a public instance method in an internal extension}} {{3-10=}}`
	`123`	`+ public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{3-10=}}`
`124`	`124`	`fileprivate func extFuncInternal() {}`
`125`	`125`	`private func extImplInternal() {}`
`126`	`126`	`}`
`127`	`127`	`fileprivate extension FilePrivateStruct {`
`128`		`- public func extMemberFilePrivate() {} // expected-warning {{declaring a public instance method in a fileprivate extension}} {{3-10=}}`
	`128`	`+ public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{3-10=}}`
`129`	`129`	`fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}`
`130`	`130`	`private func extImplFilePrivate() {}`
`131`	`131`	`}`
`132`	`132`	`private extension FilePrivateStruct {`
`133`		`- public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}`
	`133`	`+ public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}`
`134`	`134`	`fileprivate func extFuncPrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a private (equivalent to fileprivate) extension}} {{3-15=}}`
`135`	`135`	`private func extImplPrivate() {}`
`136`	`136`	`}`
`@@ -140,17 +140,17 @@ public extension PrivateStruct { // expected-error {{extension of private struct`
`140`	`140`	`private func extImplPublic() {}`
`141`	`141`	`}`
`142`	`142`	`internal extension PrivateStruct { // expected-error {{extension of private struct cannot be declared internal}} {{1-10=}}`
`143`		`- public func extMemberInternal() {} // expected-warning {{declaring a public instance method in an internal extension}} {{3-10=}}`
	`143`	`+ public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{3-10=}}`
`144`	`144`	`fileprivate func extFuncInternal() {}`
`145`	`145`	`private func extImplInternal() {}`
`146`	`146`	`}`
`147`	`147`	`fileprivate extension PrivateStruct { // expected-error {{extension of private struct cannot be declared fileprivate}} {{1-13=}}`
`148`		`- public func extMemberFilePrivate() {} // expected-warning {{declaring a public instance method in a fileprivate extension}} {{3-10=}}`
	`148`	`+ public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{3-10=}}`
`149`	`149`	`fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}`
`150`	`150`	`private func extImplFilePrivate() {}`
`151`	`151`	`}`
`152`	`152`	`private extension PrivateStruct {`
`153`		`- public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}`
	`153`	`+ public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}`
`154`	`154`	`fileprivate func extFuncPrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a private (equivalent to fileprivate) extension}} {{3-15=}}`
`155`	`155`	`private func extImplPrivate() {}`
`156`	`156`	`}`
`@@ -175,10 +175,10 @@ public class Base {`
`175`	`175`
`176`	`176`
`177`	`177`	`public extension Base {`
`178`		`- open func extMemberPublic() {} // expected-warning {{declaring open instance method in a public extension}}`
	`178`	`+ open func extMemberPublic() {} // expected-warning {{'open' modifier conflicts with extension's default access of 'public'}}`
`179`	`179`	`}`
`180`	`180`	`internal extension Base {`
`181`		`- open func extMemberInternal() {} // expected-warning {{declaring open instance method in an internal extension}}`
	`181`	`+ open func extMemberInternal() {} // expected-warning {{'open' modifier conflicts with extension's default access of 'internal'}}`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`public class PublicSub: Base {`
Original file line number	Diff line number	Diff line change
`@@ -79,17 +79,17 @@ public extension PublicStruct {`
`79`	`79`	`private func extImplPublic() {}`
`80`	`80`	`}`
`81`	`81`	`internal extension PublicStruct {`
`82`		`- public func extMemberInternal() {} // expected-warning {{declaring a public instance method in an internal extension}} {{3-10=}}`
	`82`	`+ public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{3-10=}}`
`83`	`83`	`fileprivate func extFuncInternal() {}`
`84`	`84`	`private func extImplInternal() {}`
`85`	`85`	`}`
`86`	`86`	`fileprivate extension PublicStruct {`
`87`		`- public func extMemberFilePrivate() {} // expected-warning {{declaring a public instance method in a fileprivate extension}} {{3-10=}}`
	`87`	`+ public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{3-10=}}`
`88`	`88`	`fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}`
`89`	`89`	`private func extImplFilePrivate() {}`
`90`	`90`	`}`
`91`	`91`	`private extension PublicStruct {`
`92`		`- public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}`
	`92`	`+ public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}`
`93`	`93`	`fileprivate func extFuncPrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a private (equivalent to fileprivate) extension}} {{3-15=}}`
`94`	`94`	`private func extImplPrivate() {}`
`95`	`95`	`}`
`@@ -99,17 +99,17 @@ public extension InternalStruct { // expected-error {{extension of internal stru`
`99`	`99`	`private func extImplPublic() {}`
`100`	`100`	`}`
`101`	`101`	`internal extension InternalStruct {`
`102`		`- public func extMemberInternal() {} // expected-warning {{declaring a public instance method in an internal extension}} {{3-10=}}`
	`102`	`+ public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{3-10=}}`
`103`	`103`	`fileprivate func extFuncInternal() {}`
`104`	`104`	`private func extImplInternal() {}`
`105`	`105`	`}`
`106`	`106`	`fileprivate extension InternalStruct {`
`107`		`- public func extMemberFilePrivate() {} // expected-warning {{declaring a public instance method in a fileprivate extension}} {{3-10=}}`
	`107`	`+ public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{3-10=}}`
`108`	`108`	`fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}`
`109`	`109`	`private func extImplFilePrivate() {}`
`110`	`110`	`}`
`111`	`111`	`private extension InternalStruct {`
`112`		`- public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}`
	`112`	`+ public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}`
`113`	`113`	`fileprivate func extFuncPrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a private (equivalent to fileprivate) extension}} {{3-15=}}`
`114`	`114`	`private func extImplPrivate() {}`
`115`	`115`	`}`
`@@ -119,17 +119,17 @@ public extension FilePrivateStruct { // expected-error {{extension of fileprivat`
`119`	`119`	`private func extImplPublic() {}`
`120`	`120`	`}`
`121`	`121`	`internal extension FilePrivateStruct { // expected-error {{extension of fileprivate struct cannot be declared internal}} {{1-10=}}`
`122`		`- public func extMemberInternal() {} // expected-warning {{declaring a public instance method in an internal extension}} {{3-10=}}`
	`122`	`+ public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{3-10=}}`
`123`	`123`	`fileprivate func extFuncInternal() {}`
`124`	`124`	`private func extImplInternal() {}`
`125`	`125`	`}`
`126`	`126`	`fileprivate extension FilePrivateStruct {`
`127`		`- public func extMemberFilePrivate() {} // expected-warning {{declaring a public instance method in a fileprivate extension}} {{3-10=}}`
	`127`	`+ public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{3-10=}}`
`128`	`128`	`fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}`
`129`	`129`	`private func extImplFilePrivate() {}`
`130`	`130`	`}`
`131`	`131`	`private extension FilePrivateStruct {`
`132`		`- public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}`
	`132`	`+ public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}`
`133`	`133`	`fileprivate func extFuncPrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a private (equivalent to fileprivate) extension}} {{3-15=}}`
`134`	`134`	`private func extImplPrivate() {}`
`135`	`135`	`}`
`@@ -139,17 +139,17 @@ public extension PrivateStruct { // expected-error {{extension of private struct`
`139`	`139`	`private func extImplPublic() {}`
`140`	`140`	`}`
`141`	`141`	`internal extension PrivateStruct { // expected-error {{extension of private struct cannot be declared internal}} {{1-10=}}`
`142`		`- public func extMemberInternal() {} // expected-warning {{declaring a public instance method in an internal extension}} {{3-10=}}`
	`142`	`+ public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{3-10=}}`
`143`	`143`	`fileprivate func extFuncInternal() {}`
`144`	`144`	`private func extImplInternal() {}`
`145`	`145`	`}`
`146`	`146`	`fileprivate extension PrivateStruct { // expected-error {{extension of private struct cannot be declared fileprivate}} {{1-13=}}`
`147`		`- public func extMemberFilePrivate() {} // expected-warning {{declaring a public instance method in a fileprivate extension}} {{3-10=}}`
	`147`	`+ public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{3-10=}}`
`148`	`148`	`fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}`
`149`	`149`	`private func extImplFilePrivate() {}`
`150`	`150`	`}`
`151`	`151`	`private extension PrivateStruct {`
`152`		`- public func extMemberPrivate() {} // expected-warning {{declaring a public instance method in a private extension}} {{3-10=}}`
	`152`	`+ public func extMemberPrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'private'}} {{3-10=}}`
`153`	`153`	`fileprivate func extFuncPrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a private (equivalent to fileprivate) extension}} {{3-15=}}`
`154`	`154`	`private func extImplPrivate() {}`
`155`	`155`	`}`
`@@ -174,10 +174,10 @@ public class Base {`
`174`	`174`
`175`	`175`
`176`	`176`	`public extension Base {`
`177`		`- open func extMemberPublic() {} // expected-warning {{declaring open instance method in a public extension}}`
	`177`	`+ open func extMemberPublic() {} // expected-warning {{'open' modifier conflicts with extension's default access of 'public'}}`
`178`	`178`	`}`
`179`	`179`	`internal extension Base {`
`180`		`- open func extMemberInternal() {} // expected-warning {{declaring open instance method in an internal extension}}`
	`180`	`+ open func extMemberInternal() {} // expected-warning {{'open' modifier conflicts with extension's default access of 'internal'}}`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`public class PublicSub: Base {`