jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-05-09 00:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename KClass.properties and extensionProperties: prepend 'member'

Browse Source 
To better emphasize the fact that all returned properties require an instance
of the class they are declared in. Another issue was that
'Some::class.extensionProperties' was sometimes incorrectly perceived as
"get all extension properties available on the class Some"
This commit is contained in:
Alexander Udalov
2015-07-23 22:37:08 +03:00
parent 6b24cfa3e4
commit 8f0885ca03
22 changed files with 53 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/testData/codegen/boxWithJava/reflection/kotlinPropertyInheritedInJava/K.kt vendored
View File

@@ -22,17 +22,17 @@ fun box(): String {
val klass = javaClass<J>().kotlin
if (klass.declaredProperties.isNotEmpty()) return "Fail: declaredProperties should be empty"
if (klass.declaredExtensionProperties.isNotEmpty()) return "Fail: declaredExtensionProperties should be empty"
if (klass.declaredMemberProperties.isNotEmpty()) return "Fail: declaredMemberProperties should be empty"
if (klass.declaredMemberExtensionProperties.isNotEmpty()) return "Fail: declaredMemberExtensionProperties should be empty"
val prop2 = klass.properties.firstOrNull { it.name == "prop" } ?: "Fail: no 'prop' property in properties"
val prop2 = klass.memberProperties.firstOrNull { it.name == "prop" } ?: "Fail: no 'prop' property in memberProperties"
if (prop != prop2) return "Fail: property references from :: and from properties differ: $prop != $prop2"
if (prop2 !is KMutableProperty1<*, *>) return "Fail instanceof 2"
(prop2 as KMutableProperty1<J, String>).set(j, "::)")
if (prop.get(j) != "::)") return "Fail get after 2: ${prop[j]}"
val ext = klass.extensionProperties.firstOrNull { it.name == "ext" } ?: "Fail: no 'ext' property in extensionProperties"
val ext = klass.memberExtensionProperties.firstOrNull { it.name == "ext" } ?: "Fail: no 'ext' property in memberExtensionProperties"
ext as KProperty2<J, Int, Int>
val fortyTwo = ext.get(j, 42)
if (fortyTwo != 42) return "Fail ext get: $fortyTwo"