Fix issue where markTypes would mistake an import declaration as a type

nicklockwood · Nov 13, 2020 · 7e167a4 · 7e167a4
1 parent 70f5cf5
commit 7e167a4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/Sources/Rules.swift b/Sources/Rules.swift
@@ -5126,7 +5126,7 @@ public struct _FormatRules {
                 //  extension String { } // This extension is standalone (not grouped with any type)
                 //
                 let isGroupedWithExtendingType = declarations[..<index].contains(where: {
-                    $0.name == typeName && $0.keyword != "extension"
+                    $0.name == typeName && ["class", "enum", "protocol", "struct", "typealias"].contains($0.keyword)
                 })
 
                 if isGroupedWithExtendingType {

diff --git a/Tests/RulesTests+Organization.swift b/Tests/RulesTests+Organization.swift
@@ -2175,4 +2175,20 @@ extension RulesTests {
 
         testFormatting(for: input, output, rule: FormatRules.markTypes)
     }
+
+    func testExtensionMarkWithImportOfSameName() {
+        let input = """
+        import MagazineLayout
+
+        // MARK: - MagazineLayout + FooProtocol
+
+        extension MagazineLayout: FooProtocol {}
+
+        // MARK: - MagazineLayout + BarProtocol
+
+        extension MagazineLayout: BarProtocol {}
+        """
+
+        testFormatting(for: input, rule: FormatRules.markTypes)
+    }
 }
diff --git a/Tests/XCTestManifests.swift b/Tests/XCTestManifests.swift
@@ -759,6 +759,7 @@ extension RulesTests {
         ("testExponentialGrouping", testExponentialGrouping),
         ("testExpressionCountEqualsZero", testExpressionCountEqualsZero),
         ("testExpressionCountNotEqualToZero", testExpressionCountNotEqualToZero),
+        ("testExtensionMarkWithImportOfSameName", testExtensionMarkWithImportOfSameName),
         ("testFileHeaderCreationDateReplacement", testFileHeaderCreationDateReplacement),
         ("testFileHeaderCreationYearReplacement", testFileHeaderCreationYearReplacement),
         ("testFileHeaderFileReplacement", testFileHeaderFileReplacement),