Avoid removing internal or changing private to fileprivate

nicklockwood · Sep 25, 2020 · af1d162 · af1d162
1 parent b229a52
commit af1d162
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/Sources/Rules.swift b/Sources/Rules.swift
@@ -5044,8 +5044,10 @@ public struct _FormatRules {
                 else { return declaration }
 
                 let extensionWithUpdatedVisibility: Formatter.Declaration
-                if memberVisibility == .internal {
-                    extensionWithUpdatedVisibility = formatter.remove(.internal, from: declaration)
+                if memberVisibility == extensionVisibility ||
+                    (memberVisibility == .internal && visibilityKeyword == nil)
+                {
+                    extensionWithUpdatedVisibility = declaration
                 } else {
                     extensionWithUpdatedVisibility = formatter.add(memberVisibility, to: declaration)
                 }

diff --git a/Tests/RulesTests+Organization.swift b/Tests/RulesTests+Organization.swift
@@ -1441,4 +1441,22 @@ extension RulesTests {
         """
         testFormatting(for: input, rule: FormatRules.extensionAccessControl)
     }
+
+    func testDontChangePrivateExtensionToFileprivate() {
+        let input = """
+        private extension Foo {
+            func bar() {}
+        }
+        """
+        testFormatting(for: input, rule: FormatRules.extensionAccessControl)
+    }
+
+    func testDontRemoveInternalKeywordFromExtension() {
+        let input = """
+        internal extension Foo {
+            func bar() {}
+        }
+        """
+        testFormatting(for: input, rule: FormatRules.extensionAccessControl)
+    }
 }
diff --git a/Tests/XCTestManifests.swift b/Tests/XCTestManifests.swift
@@ -663,6 +663,7 @@ extension RulesTests {
         ("testDoesntUpdateExtensionVisibilityWithInternalDeclarations", testDoesntUpdateExtensionVisibilityWithInternalDeclarations),
         ("testDoesntUpdateExtensionVisibilityWithMultipleBodyVisibilities", testDoesntUpdateExtensionVisibilityWithMultipleBodyVisibilities),
         ("testDoesntUpdatesExtensionThatHasLowerACLThanBodyDeclarations", testDoesntUpdatesExtensionThatHasLowerACLThanBodyDeclarations),
+        ("testDontChangePrivateExtensionToFileprivate", testDontChangePrivateExtensionToFileprivate),
         ("testDontCorruptPartialFragment", testDontCorruptPartialFragment),
         ("testDontCorruptPartialFragment2", testDontCorruptPartialFragment2),
         ("testDontIndentCaseAfterReturn", testDontIndentCaseAfterReturn),
@@ -682,6 +683,7 @@ extension RulesTests {
         ("testDontRemoveInitWhenUsedOnImplicitClosureMetatype", testDontRemoveInitWhenUsedOnImplicitClosureMetatype),
         ("testDontRemoveInitWhenUsedOnMetatype", testDontRemoveInitWhenUsedOnMetatype),
         ("testDontRemoveInitWithExplicitSignature", testDontRemoveInitWithExplicitSignature),
+        ("testDontRemoveInternalKeywordFromExtension", testDontRemoveInternalKeywordFromExtension),
         ("testDontRemoveSpaceBetweenOpeningBraceAndParens", testDontRemoveSpaceBetweenOpeningBraceAndParens),
         ("testDoubleIndentTrailingClosureBody", testDoubleIndentTrailingClosureBody),
         ("testDoubleIndentWhenScopesSeparatedByWrap", testDoubleIndentWhenScopesSeparatedByWrap),