add fileImport with indent pattern

danger · Nov 11, 2024 · 702b171 · 702b171
1 parent f88b659
commit 702b171
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 4 deletions.
diff --git a/Sources/RunnerLib/Files Import/DangerFileGenerator.swift b/Sources/RunnerLib/Files Import/DangerFileGenerator.swift
@@ -33,10 +33,16 @@ public final class DangerFileGenerator {
 
 private extension DangerFileGenerator {
     func mergeImports(in content: inout String) {
-        var lines = content.split(separator: "\n",
-                                  omittingEmptySubsequences: false)
-        let imports = Set(lines.filter { $0.hasPrefix("import ") })
-        lines.removeAll { imports.contains($0) }
+        var lines = content
+            .split(separator: "\n",
+                   omittingEmptySubsequences: false)
+            .map(String.init)
+
+        let imports = Set(
+            lines.map { $0.trimmingCharacters(in: .whitespaces) }
+                .filter { $0.hasPrefix("import ") }
+        )
+        lines.removeAll { imports.contains($0.trimmingCharacters(in: .whitespaces)) }
         lines.insert(contentsOf: imports.sorted(), at: 0)
         content = lines.joined(separator: "\n")
     }

diff --git a/Tests/RunnerLibTests/DangerFileGeneratorTests.swift b/Tests/RunnerLibTests/DangerFileGeneratorTests.swift
@@ -87,6 +87,18 @@ final class DangerFileGeneratorTests: XCTestCase {
 
         try assertSnapshot(matching: generatedContent(), as: .lines)
     }
+
+    func testItGeneratesTheCorrectFileWhenThereIsAreImportsWithIndent() throws {
+        try? file2Content.write(toFile: file2Path, atomically: true, encoding: .utf8)
+        try? file3Content.write(toFile: file3Path, atomically: true, encoding: .utf8)
+
+        createdFiles.append(file2Path)
+        createdFiles.append(file3Path)
+
+        try generator.generateDangerFile(fromContent: contentWithImportsWithIndent, fileName: generatedFilePath, logger: logger)
+
+        try assertSnapshot(matching: generatedContent(), as: .lines)
+    }
 }
 
 extension DangerFileGeneratorTests {
@@ -117,6 +129,16 @@ extension DangerFileGeneratorTests {
             + contentWithOneImport
     }
 
+    private var contentWithImportsWithIndent: String {
+        headerForContentWithoutImports
+            + "if flag {\n"
+            + "    // fileImport: " + file2Path + "\n"
+            + "} else {\n"
+            + "    // fileImport: " + file3Path + "\n"
+            + "}\n"
+            + contentWithoutImports
+    }
+
     private var file1Content: String {
         """
         file1Content 👍🏻

diff --git a/...ngerFileGeneratorTests/testItGeneratesTheCorrectFileWhenThereIsAreImportsWithIndent.1.txt b/...ngerFileGeneratorTests/testItGeneratesTheCorrectFileWhenThereIsAreImportsWithIndent.1.txt
@@ -0,0 +1,16 @@
+import Danger
+import Foundation
+
+let danger = Danger()
+
+if flag {
+
+file2Content ⚠️
+} else {
+
+file3Content 👩‍👩‍👦‍👦
+secondLine
+really really really really really really really really really really really really really really really really really really really really really really long text
+}
+message("Text")
+message("Another Text")