From 00239914facd9e6ef07f1b4d636f9787bda5257f Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 17 Mar 2016 21:36:47 +0300 Subject: [PATCH] Minor: refactoring --- .../synthetic/JavaSyntheticPropertiesScope.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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 dca7ad22178..9885720737c 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt @@ -54,18 +54,19 @@ interface SyntheticJavaPropertyDescriptor : PropertyDescriptor { val identifier = name.identifier if (!identifier.startsWith("get") && !identifier.startsWith("is") && !identifier.startsWith("set")) return null // optimization - val owner = getterOrSetter.containingDeclaration as? ClassDescriptor ?: return null + val classDescriptorOwner = getterOrSetter.containingDeclaration as? ClassDescriptor ?: return null val originalGetterOrSetter = getterOrSetter.original - return syntheticScopes.collectSyntheticExtensionProperties(listOf(owner.defaultType)) + return syntheticScopes.collectSyntheticExtensionProperties(listOf(classDescriptorOwner.defaultType)) .filterIsInstance() .firstOrNull { originalGetterOrSetter == it.getMethod || originalGetterOrSetter == it.setMethod } } - fun findByGetterOrSetter(getterOrSetter: FunctionDescriptor, syntheticScope: SyntheticScope) - = findByGetterOrSetter(getterOrSetter, object : SyntheticScopes { - override val scopes: Collection = listOf(syntheticScope) - }) + fun findByGetterOrSetter(getterOrSetter: FunctionDescriptor, syntheticScope: SyntheticScope) = + findByGetterOrSetter(getterOrSetter, + object : SyntheticScopes { + override val scopes: Collection = listOf(syntheticScope) + }) fun propertyNameByGetMethodName(methodName: Name): Name? = org.jetbrains.kotlin.load.java.propertyNameByGetMethodName(methodName)