azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove PropertyMetadata from project and bytecode, migrate code to KProperty

Browse Source
This commit is contained in:
Alexander Udalov
2015-11-20 16:37:47 +03:00
parent fb61dc7e81
commit 7b3b157707
22 changed files with 99 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/container/src/org/jetbrains/kotlin/container/Dsl.kt
+6 -4
View File
@@ -16,6 +16,8 @@
package org.jetbrains.kotlin.container
import kotlin.reflect.KProperty
public fun createContainer(id: String, init: StorageComponentContainer.() -> Unit): StorageComponentContainer {
val c = StorageComponentContainer(id)
c.init()
@@ -24,11 +26,11 @@ public fun createContainer(id: String, init: StorageComponentContainer.() -> Uni
}
public inline fun <reified T : Any> StorageComponentContainer.useImpl() {
registerSingleton(javaClass<T>())
registerSingleton(T::class.java)
}
public inline fun <reified T : Any> ComponentProvider.get(): T {
return getService(javaClass<T>())
return getService(T::class.java)
}
@Suppress("UNCHECKED_CAST")
@@ -40,6 +42,6 @@ public fun StorageComponentContainer.useInstance(instance: Any) {
registerInstance(instance)
}
inline operator fun <reified T : Any> ComponentProvider.getValue(thisRef: Any?, desc: PropertyMetadata): T {
return getService(javaClass<T>())
inline operator fun <reified T : Any> ComponentProvider.getValue(thisRef: Any?, desc: KProperty<*>): T {
return getService(T::class.java)
}