Fix removal of @_exported imports

nicklockwood · Oct 12, 2022 · d208709 · d208709
1 parent 852199c
commit d208709
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/Sources/ParsingHelpers.swift b/Sources/ParsingHelpers.swift
@@ -1136,7 +1136,11 @@ extension Formatter {
     struct ImportRange: Comparable {
         var module: String
         var range: Range<Int>
-        var isTestable: Bool
+        var attributes: [String]
+
+        var isTestable: Bool {
+            attributes.contains("@testable")
+        }
 
         static func < (lhs: ImportRange, rhs: ImportRange) -> Bool {
             let la = lhs.module.lowercased()
@@ -1218,7 +1222,7 @@ extension Formatter {
                 importRanges.append(ImportRange(
                     module: name,
                     range: range,
-                    isTestable: tokens[range].contains(.keyword("@testable"))
+                    attributes: tokens[range].compactMap { $0.isAttribute ? $0.string : nil }
                 ))
             } else {
                 // Error

diff --git a/Sources/Rules.swift b/Sources/Rules.swift
@@ -4887,6 +4887,7 @@ public struct _FormatRules {
                 return ranges.sorted { $0.module.count < $1.module.count }
             }
             // Group @testable imports at the top or bottom
+            // TODO: need more general solution for handling other import attributes
             return ranges.sorted {
                 // If both have a @testable keyword, or neither has one, just sort alphabetically
                 guard $0.isTestable != $1.isTestable else {
@@ -4927,7 +4928,7 @@ public struct _FormatRules {
                     continue
                 }
                 let range2 = importRanges[j]
-                if !range.isTestable || range2.isTestable {
+                if Set(range.attributes).isSubset(of: range2.attributes) {
                     formatter.removeTokens(in: range.range)
                     continue
                 }

diff --git a/Tests/RulesTests+Redundancy.swift b/Tests/RulesTests+Redundancy.swift
@@ -4780,6 +4780,18 @@ class RedundancyTests: RulesTests {
         testFormatting(for: input, output, rule: FormatRules.duplicateImports)
     }
 
+    func testNoRemoveExportedDuplicateImport() {
+        let input = "import Foo\n@_exported import Foo"
+        let output = "\n@_exported import Foo"
+        testFormatting(for: input, output, rule: FormatRules.duplicateImports)
+    }
+
+    func testNoRemoveExportedDuplicateImport2() {
+        let input = "@_exported import Foo\nimport Foo"
+        let output = "@_exported import Foo"
+        testFormatting(for: input, output, rule: FormatRules.duplicateImports)
+    }
+
     // MARK: - unusedArguments
 
     // closures