fix bug where optimizer assumed references to existing provides were …

…always properties Fixes #321
evant · Nov 27, 2023 · cac1373 · cac1373
1 parent 16bc1bc
commit cac1373
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/integration-tests/common/src/test/kotlin/me/tatarka/inject/test/ProvidesTest.kt b/integration-tests/common/src/test/kotlin/me/tatarka/inject/test/ProvidesTest.kt
@@ -209,6 +209,22 @@ abstract class ProvidesInnerClassComponent {
     abstract val fooFactory: DifferentPackageFoo.Factory
 }
 
+// https://github.com/evant/kotlin-inject/issues/321
+@Component
+abstract class OptimizesProvides {
+    @Provides
+    fun OFooImpl.bind(): OFoo = this
+    abstract fun provideFoo(): OFoo
+    abstract fun provideBar(): OBar
+}
+
+interface OFoo
+@Inject
+class OFooImpl : OFoo
+
+@Inject
+class OBar(val foo: OFoo)
+
 class ProvidesTest {
 
     @Test
@@ -307,4 +323,12 @@ class ProvidesTest {
 
         assertThat(component.fooFactory).isNotNull()
     }
+
+    @Test
+    fun generates_a_component_where_a_provides_fun_optimizes_to_references_another_provides_fun() {
+        val component = OptimizesProvides::class.create()
+
+        assertThat(component.provideFoo()).isNotNull()
+        assertThat(component.provideBar()).isNotNull()
+    }
 }
diff --git a/...in-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/TypeResultOptimizer.kt b/...in-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/TypeResultOptimizer.kt
@@ -31,7 +31,7 @@ fun List<TypeResult.Provider>.optimize(context: Context): List<TypeResult.Provid
         val newResult = TypeResult.Provides(
             className = context.className,
             methodName = name,
-            isProperty = true,
+            isProperty = provider?.isProperty ?: true,
         )
         if (provider == null) {
             provider = TypeResult.Provider(