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

Minor: simplify code

Browse Source
This commit is contained in:
Zalim Bashorov
2015-10-27 21:53:36 +03:00
parent 520e90acf1
commit f1638bf6fd
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt
+6 -8
View File
@@ -44,8 +44,6 @@ import org.jetbrains.kotlin.utils.addIfNotNull
import java.util.* import java.util.*
import kotlin.properties.Delegates import kotlin.properties.Delegates
private val POSSIBLE_GETTER_NAMES_CAPACITY = 3
interface SyntheticJavaPropertyDescriptor : PropertyDescriptor { interface SyntheticJavaPropertyDescriptor : PropertyDescriptor {
val getMethod: FunctionDescriptor val getMethod: FunctionDescriptor
val setMethod: FunctionDescriptor? val setMethod: FunctionDescriptor?
@@ -90,12 +88,12 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
private fun syntheticPropertyInClassNotCached(ownerClass: ClassDescriptor, name: Name): SyntheticPropertyHolder { private fun syntheticPropertyInClassNotCached(ownerClass: ClassDescriptor, name: Name): SyntheticPropertyHolder {
fun result(descriptor: PropertyDescriptor?, getterNames: Sequence<Name>, setterName: Name? = null): SyntheticPropertyHolder { fun result(descriptor: PropertyDescriptor?, getterNames: List<Name>, setterName: Name? = null): SyntheticPropertyHolder {
if (lookupTracker == LookupTracker.DO_NOTHING) { if (lookupTracker == LookupTracker.DO_NOTHING) {
return if (descriptor == null) SyntheticPropertyHolder.EMPTY else SyntheticPropertyHolder(descriptor, emptyList()) return if (descriptor == null) SyntheticPropertyHolder.EMPTY else SyntheticPropertyHolder(descriptor, emptyList())
} }
val names = ArrayList<Name>(POSSIBLE_GETTER_NAMES_CAPACITY + (setterName?.let { 1 } ?: 0)) val names = ArrayList<Name>(getterNames.size + (setterName?.let { 1 } ?: 0))
names.addAll(getterNames) names.addAll(getterNames)
names.addIfNotNull(setterName) names.addIfNotNull(setterName)
@@ -115,7 +113,7 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
val possibleGetMethodNames = possibleGetMethodNames(name) val possibleGetMethodNames = possibleGetMethodNames(name)
val getMethod = possibleGetMethodNames val getMethod = possibleGetMethodNames
.flatMap { memberScope.getFunctions(it, NoLookupLocation.FROM_SYNTHETIC_SCOPE).asSequence() } .flatMap { memberScope.getFunctions(it, NoLookupLocation.FROM_SYNTHETIC_SCOPE) }
.singleOrNull { .singleOrNull {
isGoodGetMethod(it) && it.hasJavaOriginInHierarchy() isGoodGetMethod(it) && it.hasJavaOriginInHierarchy()
} ?: return result(null, possibleGetMethodNames) } ?: return result(null, possibleGetMethodNames)
@@ -228,8 +226,8 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
//TODO: reuse code with generation? //TODO: reuse code with generation?
private fun possibleGetMethodNames(propertyName: Name): Sequence<Name> { private fun possibleGetMethodNames(propertyName: Name): List<Name> {
val result = ArrayList<Name>(POSSIBLE_GETTER_NAMES_CAPACITY) val result = ArrayList<Name>(3)
val identifier = propertyName.identifier val identifier = propertyName.identifier
if (JvmAbi.startsWithIsPrefix(identifier)) { if (JvmAbi.startsWithIsPrefix(identifier)) {
@@ -243,7 +241,7 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
result.add(Name.identifier("get" + capitalize2)) result.add(Name.identifier("get" + capitalize2))
} }
return result.asSequence() return result
.filter { SyntheticJavaPropertyDescriptor.propertyNameByGetMethodName(it) == propertyName } // don't accept "uRL" for "getURL" etc .filter { SyntheticJavaPropertyDescriptor.propertyNameByGetMethodName(it) == propertyName } // don't accept "uRL" for "getURL" etc
} }