Skip to content

Commit

Permalink
Revert "Fix reified type for createScope, getScopeId, getScopeName"
Browse files Browse the repository at this point in the history
This reverts commit 64d5408.
  • Loading branch information
arnaudgiuliani committed Jun 5, 2023
1 parent 40f6286 commit d6c8f87
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion core/koin-core/src/commonMain/kotlin/org/koin/core/Koin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ class Koin {
* Create a Scope instance
* @param scopeDefinitionName
*/
inline fun <reified T : KoinScopeComponent> createScope(t: T): Scope {
fun <T : KoinScopeComponent> createScope(t: T): Scope {
val scopeId = t.getScopeId()
val qualifier = t.getScopeName()
return scopeRegistry.createScope(scopeId, qualifier, null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@ interface KoinScopeComponent : KoinComponent {
}
}

inline fun <reified T : Any> T.getScopeId() = T::class.getFullName() + "@" + this.hashCode()
inline fun <reified T : Any>T.getScopeName() = TypeQualifier(T::class)
fun <T : Any> T.getScopeId() = this::class.getFullName() + "@" + this.hashCode()
fun <T : Any> T.getScopeName() = TypeQualifier(this::class)

inline fun <reified T : KoinScopeComponent> T.createScope(source: Any? = null): Scope {
fun <T : KoinScopeComponent> T.createScope(source: Any? = null): Scope {
return getKoin().createScope(getScopeId(), getScopeName(), source)
}

inline fun <reified T : KoinScopeComponent> T.getScopeOrNull(): Scope? {
fun <T : KoinScopeComponent> T.getScopeOrNull(): Scope? {
return getKoin().getScopeOrNull(getScopeId())
}

inline fun <reified T: KoinScopeComponent> T.newScope() = lazy { createScope() }
inline fun <reified T : KoinScopeComponent> T.getOrCreateScope() = lazy { getScopeOrNull() ?: createScope() }
fun <T : KoinScopeComponent> T.newScope() = lazy { createScope() }
fun <T : KoinScopeComponent> T.getOrCreateScope() = lazy { getScopeOrNull() ?: createScope() }
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ class ObjectScopeTest {
@Test
fun `scope from instance object`() {
val koin = startKoin {
printLogger(Level.DEBUG)
modules(module {
single { A() }
scope<A> {
Expand Down

0 comments on commit d6c8f87

Please sign in to comment.