Fix a bug in the component validation (#54)

If the inferred component and the installIn component were the same, then validation would fail.
ansman · Jun 5, 2023 · ab7b42f · ab7b42f
1 parent 1dd62a7
commit ab7b42f
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 10 deletions.
diff --git a/compiler/src/main/kotlin/se/ansman/dagger/auto/compiler/processors/AutoBindProcessor.kt b/compiler/src/main/kotlin/se/ansman/dagger/auto/compiler/processors/AutoBindProcessor.kt
@@ -248,13 +248,13 @@ class AutoBindProcessor<N, TypeName : Any, ClassName : TypeName, AnnotationSpec,
         inferredComponent: ClassName,
     ): Boolean {
         var c = inferredComponent
-        while (c != installInComponent) {
+        do {
             c = resolver.lookupType(c)
                 .getAnnotation(DefineComponent::class)
                 ?.getValue<ClassDeclaration<N, TypeName, ClassName, AnnotationSpec>>("parent")
                 ?.className
                 ?: return false
-        }
+        } while (c != installInComponent)
         return true
     }
 

diff --git a/...ts/auto_bind/child_component/Repsitory.kt → ...to_bind/component_validation/Repsitory.kt b/...ts/auto_bind/child_component/Repsitory.kt → ...to_bind/component_validation/Repsitory.kt
@@ -1,14 +1,15 @@
-package tests.auto_bind.child_component
+package tests.auto_bind.component_validation
 
 import dagger.hilt.android.components.ActivityComponent
 import dagger.hilt.android.components.FragmentComponent
+import dagger.hilt.components.SingletonComponent
 import se.ansman.dagger.auto.AutoBind
 import javax.inject.Inject
 import javax.inject.Singleton
 
 interface Repository
 
-@AutoBind
+@AutoBind(inComponent = SingletonComponent::class)
 @Singleton
 class GlobalRepository @Inject constructor() : Repository
 

diff --git a/...ActivityRepositoryActivityModule.java.txt → ...ActivityRepositoryActivityModule.java.txt b/...ActivityRepositoryActivityModule.java.txt → ...ActivityRepositoryActivityModule.java.txt
@@ -1,5 +1,5 @@
 // Code generated by Auto Dagger. Do not edit.
-package tests.auto_bind.child_component;
+package tests.auto_bind.component_validation;
 
 import dagger.Binds;
 import dagger.Module;

diff --git a/...FragmentRepositoryFragmentModule.java.txt → ...FragmentRepositoryFragmentModule.java.txt b/...FragmentRepositoryFragmentModule.java.txt → ...FragmentRepositoryFragmentModule.java.txt
@@ -1,5 +1,5 @@
 // Code generated by Auto Dagger. Do not edit.
-package tests.auto_bind.child_component;
+package tests.auto_bind.component_validation;
 
 import dagger.Binds;
 import dagger.Module;

diff --git a/...dGlobalRepositorySingletonModule.java.txt → ...dGlobalRepositorySingletonModule.java.txt b/...dGlobalRepositorySingletonModule.java.txt → ...dGlobalRepositorySingletonModule.java.txt
@@ -1,5 +1,5 @@
 // Code generated by Auto Dagger. Do not edit.
-package tests.auto_bind.child_component;
+package tests.auto_bind.component_validation;
 
 import dagger.Binds;
 import dagger.Module;

diff --git a/...ndActivityRepositoryActivityModule.kt.txt → ...ndActivityRepositoryActivityModule.kt.txt b/...ndActivityRepositoryActivityModule.kt.txt → ...ndActivityRepositoryActivityModule.kt.txt
@@ -1,5 +1,5 @@
 // Code generated by Auto Dagger. Do not edit.
-package tests.auto_bind.child_component
+package tests.auto_bind.component_validation
 
 import dagger.Binds
 import dagger.Module

diff --git a/...ndFragmentRepositoryFragmentModule.kt.txt → ...ndFragmentRepositoryFragmentModule.kt.txt b/...ndFragmentRepositoryFragmentModule.kt.txt → ...ndFragmentRepositoryFragmentModule.kt.txt
@@ -1,5 +1,5 @@
 // Code generated by Auto Dagger. Do not edit.
-package tests.auto_bind.child_component
+package tests.auto_bind.component_validation
 
 import dagger.Binds
 import dagger.Module

diff --git a/...indGlobalRepositorySingletonModule.kt.txt → ...indGlobalRepositorySingletonModule.kt.txt b/...indGlobalRepositorySingletonModule.kt.txt → ...indGlobalRepositorySingletonModule.kt.txt
@@ -1,5 +1,5 @@
 // Code generated by Auto Dagger. Do not edit.
-package tests.auto_bind.child_component
+package tests.auto_bind.component_validation
 
 import dagger.Binds
 import dagger.Module