Load special property from Java in cases of J-K-J hierarchy

This commit is contained in:
Denis Zharkov
2015-10-19 17:38:57 +03:00
parent e31f751830
commit c46b766fea
4 changed files with 52 additions and 2 deletions
@@ -151,8 +151,12 @@ public class LazyJavaClassMemberScope(
}
private fun PropertyDescriptor.findGetterOverride(): JavaMethodDescriptor? {
val specialGetterName = getter?.getOverriddenBuiltinWithDifferentJvmName()?.getBuiltinSpecialPropertyGetterName()
if (specialGetterName != null) {
val overriddenBuiltinProperty = getter?.getOverriddenBuiltinWithDifferentJvmName()
val specialGetterName = overriddenBuiltinProperty?.getBuiltinSpecialPropertyGetterName()
if (specialGetterName != null
&& !this@LazyJavaClassMemberScope.getContainingDeclaration().hasRealKotlinSuperClassWithOverrideOf(
overriddenBuiltinProperty!!)
) {
return findGetterByName(specialGetterName)
}