Fix incorrect importing of local types

outfoxx · Dec 20, 2023 · 7f2df80 · 7f2df80
1 parent 4ccf88c
commit 7f2df80
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 0 deletions.
diff --git a/src/main/java/io/outfoxx/swiftpoet/CodeWriter.kt b/src/main/java/io/outfoxx/swiftpoet/CodeWriter.kt
@@ -271,6 +271,9 @@ internal class CodeWriter(
   }
 
   private fun referenceTypeName(typeName: DeclaredTypeName) {
+    if (typeName.moduleName.isEmpty()) {
+      return
+    }
     referencedTypes[typeName.canonicalName] = typeName
   }
 

diff --git a/src/main/java/io/outfoxx/swiftpoet/ImportSpec.kt b/src/main/java/io/outfoxx/swiftpoet/ImportSpec.kt
@@ -59,6 +59,10 @@ class ImportSpec internal constructor(
     internal val doc = CodeBlock.builder()
     internal val guardTest = CodeBlock.builder()
 
+    init {
+      require(name.isNotBlank()) { "name is empty" }
+    }
+
     fun addDoc(format: String, vararg args: Any) = apply {
       doc.add(format, *args)
     }

diff --git a/src/test/java/io/outfoxx/swiftpoet/test/FileSpecTests.kt b/src/test/java/io/outfoxx/swiftpoet/test/FileSpecTests.kt
@@ -366,7 +366,40 @@ class FileSpecTests {
       )
     )
   }
+  @Test
+  @DisplayName("Emits local module types without import")
+  fun testLocalTypesAreNotImported() {
+    val type =
+      TypeSpec.structBuilder("SomeType")
+        .addProperty(
+          PropertySpec.varBuilder(
+            "myStuff",
+            typeName(".MyStuff")
+          ).build()
+        )
+        .build()
+
+    val testFile = FileSpec.builder("Test", "Test")
+      .addType(type)
+      .build()
+
+    val out = StringWriter()
+    testFile.writeTo(out)
+
+    assertThat(
+      out.toString(),
+      equalTo(
+        """
+            struct SomeType {
 
+              var myStuff: MyStuff
+
+            }
+
+        """.trimIndent()
+      )
+    )
+  }
   @Test
   @DisplayName("Generates guarded imports")
   fun testGenGuardedImports() {