Change swiftformat rule for extension access modifiers

Summary: This helps ensure that we don't over-expose symbols in type extensions. Reviewed By: jawwad Differential Revision: D39636127 fbshipit-source-id: e99f7d9173933be92072e7e6a85a6f8ea61a3cf0
azhar11988 · Sep 21, 2022 · fcb4cd4 · fcb4cd4
1 parent cc19c8a
commit fcb4cd4
Show file tree

Hide file tree

Showing 72 changed files with 143 additions and 18 deletions.
diff --git a/.swiftformat b/.swiftformat
@@ -104,6 +104,7 @@
 # --rules wrapSwitchCases # (opt-in) # splits "case .one, .two:" onto 2 lines
 
 # Options
+--extensionacl on-declarations
 --header "/*\n * Copyright (c) Meta Platforms, Inc. and affiliates.\n * All rights reserved.\n *\n * This source code is licensed under the license found in the\n * LICENSE file in the root directory of this source tree.\n */"
 --ifdef no-indent
 --importgrouping  "testable-first"

diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -115,7 +115,6 @@ only_rules:
   - empty_string
   - empty_xctest_method
   - explicit_init
-  - extension_access_modifier
   - fallthrough
   - fatal_error_message
   - file_header

diff --git a/FBAEMKit/FBAEMKitTests/AEMAdvertiserMultiEntryRuleTests.swift b/FBAEMKit/FBAEMKitTests/AEMAdvertiserMultiEntryRuleTests.swift
@@ -198,8 +198,8 @@ final class AEMAdvertiserMultiEntryRuleTests: XCTestCase {
 
 // MARK: - Assumptions
 
-fileprivate extension String {
-  static let isCodable = "AEMAdvertiserMultiEntryRule should be encodable and decodable"
+extension String {
+  fileprivate static let isCodable = "AEMAdvertiserMultiEntryRule should be encodable and decodable"
 }
 
 #endif
diff --git a/FBAEMKit/FBAEMKitTests/AEMAdvertiserSingleEntryRuleTests.swift b/FBAEMKit/FBAEMKitTests/AEMAdvertiserSingleEntryRuleTests.swift
@@ -482,6 +482,6 @@ final class AEMAdvertiserSingleEntryRuleTests: XCTestCase {
 
 // MARK: - Assumptions
 
-fileprivate extension String {
-  static let isCodable = "AEMAdvertiserSingleEntryRule should be encodable and decodable"
+extension String {
+  fileprivate static let isCodable = "AEMAdvertiserSingleEntryRule should be encodable and decodable"
 }
diff --git a/FBAEMKit/FBAEMKitTests/AEMConfigurationTests.swift b/FBAEMKit/FBAEMKitTests/AEMConfigurationTests.swift
@@ -350,6 +350,6 @@ final class AEMConfigurationTests: XCTestCase {
 
 // MARK: - Assumptions
 
-fileprivate extension String {
-  static let isCodable = "AEMConfiguration should be encodable and decodable"
+extension String {
+  fileprivate static let isCodable = "AEMConfiguration should be encodable and decodable"
 }
diff --git a/FBAEMKit/FBAEMKitTests/AEMEventTests.swift b/FBAEMKit/FBAEMKitTests/AEMEventTests.swift
@@ -180,6 +180,6 @@ final class AEMEventTests: XCTestCase {
 
 // MARK: - Assumptions
 
-fileprivate extension String {
-  static let isCodable = "AEMEvents should be encodable and decodable"
+extension String {
+  fileprivate static let isCodable = "AEMEvents should be encodable and decodable"
 }
diff --git a/FBAEMKit/FBAEMKitTests/AEMInvocationTests.swift b/FBAEMKit/FBAEMKitTests/AEMInvocationTests.swift
@@ -1185,6 +1185,8 @@ final class AEMInvocationTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBAEMKit/FBAEMKitTests/AEMRuleTests.swift b/FBAEMKit/FBAEMKitTests/AEMRuleTests.swift
@@ -353,6 +353,6 @@ final class AEMRuleTests: XCTestCase {
 
 // MARK: - Assumptions
 
-fileprivate extension String {
-  static let isCodable = "AEMRule should be encodable and decodable"
+extension String {
+  fileprivate static let isCodable = "AEMRule should be encodable and decodable"
 }
diff --git a/FBAEMKit/FBAEMKitTests/AEMSettingsTests.swift b/FBAEMKit/FBAEMKitTests/AEMSettingsTests.swift
@@ -44,6 +44,8 @@ final class AEMSettingsTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBAEMKit/FBAEMKitTests/DependentAsTypeTests.swift b/FBAEMKit/FBAEMKitTests/DependentAsTypeTests.swift
@@ -131,6 +131,8 @@ private enum CustomImplementationDependent: DependentAsType {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit/FBSDKCoreKit/AccessToken.swift b/FBSDKCoreKit/FBSDKCoreKit/AccessToken.swift
@@ -9,27 +9,27 @@
 import Foundation
 
 /// AccessToken Extension
-public extension AccessToken {
+extension AccessToken {
   /// Returns the known granted permissions.
-  var permissions: Set<Permission> {
+  public var permissions: Set<Permission> {
     Set(__permissions.map { Permission(stringLiteral: $0) })
   }
 
   /// Returns the known declined permissions.
-  var declinedPermissions: Set<Permission> {
+  public var declinedPermissions: Set<Permission> {
     Set(__declinedPermissions.map { Permission(stringLiteral: $0) })
   }
 
   /// Returns the known expired permissions.
-  var expiredPermissions: Set<Permission> {
+  public var expiredPermissions: Set<Permission> {
     Set(__expiredPermissions.map { Permission(stringLiteral: $0) })
   }
 
   /**
    Convenience getter to determine if a permission has been granted
    - parameter permission: The permission to check
    */
-  func hasGranted(_ permission: Permission) -> Bool {
+  public func hasGranted(_ permission: Permission) -> Bool {
     hasGranted(permission: permission.name)
   }
 }
diff --git a/FBSDKCoreKit/FBSDKCoreKit/ApplicationDelegate.swift b/FBSDKCoreKit/FBSDKCoreKit/ApplicationDelegate.swift
@@ -521,11 +521,13 @@ public final class ApplicationDelegate: NSObject {
   #endif
 }
 
+// swiftformat:disable:next extensionaccesscontrol
 fileprivate extension AppEvents.Name {
   static let appLinkInboundEvent = Self("fb_al_inbound")
   static let autoAppLink = Self("fb_auto_applink")
 }
 
+// swiftformat:disable:next extensionaccesscontrol
 fileprivate extension AppEvents.ParameterName {
   static let targetURL = Self("targetURL")
   static let targetURLHost = Self("targetURLHost")

diff --git a/FBSDKCoreKit/FBSDKCoreKit/Internal/Configuration/CoreKitConfigurator.swift b/FBSDKCoreKit/FBSDKCoreKit/Internal/Configuration/CoreKitConfigurator.swift
@@ -58,6 +58,7 @@ final class CoreKitConfigurator: CoreKitConfiguring {
 
 // MARK: - All platforms
 
+// swiftformat:disable:next extensionaccesscontrol
 private extension CoreKitConfigurator {
   func configureAccessToken() {
     AccessToken.configure(

diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/AccessTokenTests.swift b/FBSDKCoreKit/FBSDKCoreKitTests/AccessTokenTests.swift
@@ -212,6 +212,8 @@ final class AccessTokenTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/AuthenticationTokenTests.swift b/FBSDKCoreKit/FBSDKCoreKitTests/AuthenticationTokenTests.swift
@@ -78,6 +78,8 @@ final class AuthenticationTokenTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/DependentAsInstanceTests.swift b/FBSDKCoreKit/FBSDKCoreKitTests/DependentAsInstanceTests.swift
@@ -131,6 +131,8 @@ private final class CustomImplementationDependent: DependentAsInstance {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/AppEvents/AppEventsConfigurationTests.swift b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/AppEvents/AppEventsConfigurationTests.swift
@@ -145,6 +145,8 @@ final class AppEventsConfigurationTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 extension AppEventsConfiguration {
   // swiftlint:disable:next override_in_extension
   open override func isEqual(_ object: Any?) -> Bool {

diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/AppEvents/PaymentProductRequestorFactoryTests.swift b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/AppEvents/PaymentProductRequestorFactoryTests.swift
@@ -199,6 +199,8 @@ final class PaymentProductRequestorFactoryTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/DependentAsTypeTests.swift b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/DependentAsTypeTests.swift
@@ -131,6 +131,8 @@ private enum CustomImplementationDependent: DependentAsType {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/FeatureManagerTests.swift b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/FeatureManagerTests.swift
@@ -254,6 +254,8 @@ final class FeatureManagerTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/NotificationCenterTests.swift b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/NotificationCenterTests.swift
@@ -88,6 +88,8 @@ final class NotificationCenterTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/ProcessInfoTests.swift b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/ProcessInfoTests.swift
@@ -55,6 +55,8 @@ final class ProcessInfoTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/ServerConfiguration/DialogConfigurationTests.swift b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/ServerConfiguration/DialogConfigurationTests.swift
@@ -51,6 +51,8 @@ final class DialogConfigurationTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/UI/ViewImpressionLoggerTests.swift b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/UI/ViewImpressionLoggerTests.swift
@@ -261,6 +261,8 @@ final class ViewImpressionLoggerTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/WebDialog/WebDialogTests.swift b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/WebDialog/WebDialogTests.swift
@@ -173,6 +173,8 @@ final class WebDialogTests: XCTestCase, WebDialogDelegate {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/LocationTests.swift b/FBSDKCoreKit/FBSDKCoreKitTests/LocationTests.swift
@@ -61,6 +61,8 @@ final class LocationTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/ProfilePictureViewTests.swift b/FBSDKCoreKit/FBSDKCoreKitTests/ProfilePictureViewTests.swift
@@ -325,6 +325,8 @@ final class ProfilePictureViewTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/ProfileTests.swift b/FBSDKCoreKit/FBSDKCoreKitTests/ProfileTests.swift
@@ -1064,6 +1064,8 @@ final class ProfileTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/UserAgeRangeTests.swift b/FBSDKCoreKit/FBSDKCoreKitTests/UserAgeRangeTests.swift
@@ -93,6 +93,8 @@ final class UserAgeRangeTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit_Basics/FBSDKCoreKit_BasicsTests/BundleTests.swift b/FBSDKCoreKit_Basics/FBSDKCoreKit_BasicsTests/BundleTests.swift
@@ -51,6 +51,8 @@ final class BundleTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit_Basics/FBSDKCoreKit_BasicsTests/DataTests.swift b/FBSDKCoreKit_Basics/FBSDKCoreKit_BasicsTests/DataTests.swift
@@ -19,6 +19,8 @@ final class DataTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit_Basics/FBSDKCoreKit_BasicsTests/FileManagerTests.swift b/FBSDKCoreKit_Basics/FBSDKCoreKit_BasicsTests/FileManagerTests.swift
@@ -85,6 +85,8 @@ final class FileManagerTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit_Basics/FBSDKCoreKit_BasicsTests/NotificationCenterTests.swift b/FBSDKCoreKit_Basics/FBSDKCoreKit_BasicsTests/NotificationCenterTests.swift
@@ -106,6 +106,8 @@ final class NotificationCenterTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit_Basics/FBSDKCoreKit_BasicsTests/URLSessionDataTaskTests.swift b/FBSDKCoreKit_Basics/FBSDKCoreKit_BasicsTests/URLSessionDataTaskTests.swift
@@ -38,6 +38,8 @@ final class URLSessionDataTaskTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit_Basics/FBSDKCoreKit_BasicsTests/URLSessionTests.swift b/FBSDKCoreKit_Basics/FBSDKCoreKit_BasicsTests/URLSessionTests.swift
@@ -30,6 +30,8 @@ final class URLSessionTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKCoreKit_Basics/FBSDKCoreKit_BasicsTests/UserDefaultsTests.swift b/FBSDKCoreKit_Basics/FBSDKCoreKit_BasicsTests/UserDefaultsTests.swift
@@ -74,6 +74,8 @@ final class UserDefaultsTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKGamingServicesKit/FBSDKGamingServicesKitTests/ChooseContextDialogFactoryTests.swift b/FBSDKGamingServicesKit/FBSDKGamingServicesKitTests/ChooseContextDialogFactoryTests.swift
@@ -43,6 +43,8 @@ final class ChooseContextDialogFactoryTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 public extension ChooseContextContent {
   // swiftlint:disable:next override_in_extension
   override func isEqual(_ object: Any?) -> Bool {

diff --git a/FBSDKGamingServicesKit/FBSDKGamingServicesKitTests/DependentAsTypeTests.swift b/FBSDKGamingServicesKit/FBSDKGamingServicesKitTests/DependentAsTypeTests.swift
@@ -131,6 +131,8 @@ private enum CustomImplementationDependent: DependentAsType {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKGamingServicesKit/FBSDKGamingServicesKitTests/FileHandleTests.swift b/FBSDKGamingServicesKit/FBSDKGamingServicesKitTests/FileHandleTests.swift
@@ -54,6 +54,8 @@ final class FileHandleTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKGamingServicesKit/FBSDKGamingServicesKitTests/GameRequestDialogTests.swift b/FBSDKGamingServicesKit/FBSDKGamingServicesKitTests/GameRequestDialogTests.swift
@@ -453,6 +453,8 @@ final class GameRequestDialogTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {

diff --git a/FBSDKGamingServicesKit/FBSDKGamingServicesKitTests/GameRequestURLProviderTests.swift b/FBSDKGamingServicesKit/FBSDKGamingServicesKitTests/GameRequestURLProviderTests.swift
@@ -202,6 +202,8 @@ final class GameRequestURLProviderTests: XCTestCase {
   }
 }
 
+// swiftformat:disable extensionaccesscontrol
+
 // MARK: - Assumptions
 
 fileprivate extension String {
-Original file line number
+Diff line change
@@ Expand Up / @@ -1185,6 +1185,8 @@ final class AEMInvocationTests: XCTestCase { @@
       }
     }
+    // swiftformat:disable extensionaccesscontrol
     // MARK: - Assumptions
     fileprivate extension String {
@@ Expand Down @@