diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java index bcc5ccac945..e7f3ec0328c 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java @@ -106,6 +106,11 @@ class JavaDescriptorResolverHelper { for (PsiMethod method : psiClass.getPsiClass().getAllMethods()) { getNamedMembers(method.getName()); + + PropertyParseResult propertyParseResult = PropertyNameUtils.parseMethodToProperty(method.getName()); + if (propertyParseResult != null) { + getNamedMembers(propertyParseResult.getPropertyName()); + } } diff --git a/compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.kt b/compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.kt new file mode 100644 index 00000000000..b4b2c6737ab --- /dev/null +++ b/compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.kt @@ -0,0 +1,8 @@ +package test + +open class BaseClass() { + val exactly = 17 +} + +class Subclass() : BaseClass() { +} diff --git a/compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.txt b/compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.txt new file mode 100644 index 00000000000..8f62a7c7c4d --- /dev/null +++ b/compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.txt @@ -0,0 +1,10 @@ +namespace test + +final class test.Subclass : test.BaseClass { + final /*constructor*/ fun (): test.Subclass + final val exactly: jet.Int +} +open class test.BaseClass : jet.Any { + final /*constructor*/ fun (): test.BaseClass + final val exactly: jet.Int +}