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

Do not load common for special properties from Java

Browse Source 
I.e. do not treat getName in Java enum as override of Enum.name
This commit is contained in:
Denis Zharkov
2015-10-16 18:33:08 +03:00
parent 28c46b73f1
commit cc94acdabc
4 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt
+5 -4
View File
@@ -148,11 +148,12 @@ public class LazyJavaClassMemberScope(
}
private fun PropertyDescriptor.findGetterOverride(): JavaMethodDescriptor? {
val commonProperty = findGetterByName(JvmAbi.getterName(name.asString()))
if (commonProperty != null) return commonProperty
val specialGetterName = getter?.getOverriddenBuiltinWithDifferentJvmName()?.getBuiltinSpecialPropertyGetterName()
if (specialGetterName != null) {
return findGetterByName(specialGetterName)
}
val specialGetterName = getter?.getOverriddenBuiltinWithDifferentJvmName()?.getBuiltinSpecialPropertyGetterName() ?: return null
return findGetterByName(specialGetterName)
return findGetterByName(JvmAbi.getterName(name.asString()))
}
private fun PropertyDescriptor.findGetterByName(getterName: String): JavaMethodDescriptor? {