diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt index 620d809ffe7..be1a008aadf 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt @@ -58,8 +58,21 @@ interface SyntheticJavaPropertyDescriptor : PropertyDescriptor { val classDescriptorOwner = getterOrSetter.containingDeclaration as? ClassDescriptor ?: return null val originalGetterOrSetter = getterOrSetter.original - return syntheticScopes.collectSyntheticExtensionProperties(listOf(classDescriptorOwner.defaultType)) - .filterIsInstance() + + val names = listOfNotNull( + propertyNameByGetMethodName(name), + propertyNameBySetMethodName(name, withIsPrefix = true), + propertyNameBySetMethodName(name, withIsPrefix = false) + ) + + return names + .flatMap { + syntheticScopes.collectSyntheticExtensionProperties( + listOf(classDescriptorOwner.defaultType), + it, + NoLookupLocation.FROM_SYNTHETIC_SCOPE + ) + }.filterIsInstance() .firstOrNull { originalGetterOrSetter == it.getMethod || originalGetterOrSetter == it.setMethod } }