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

Minor. Convert extension to common function

Browse Source
This commit is contained in:
Denis Zharkov
2015-10-26 14:20:26 +03:00
parent 50125f612e
commit 060178e53f
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt
+7 -7
View File
@@ -88,25 +88,25 @@ public class LazyJavaClassMemberScope(
).toReadOnlyList()
}
override fun JavaMethodDescriptor.isVisibleAsFunction() = (this as SimpleFunctionDescriptor).isVisibleAsFunction()
override fun JavaMethodDescriptor.isVisibleAsFunction() = isVisibleAsFunction(this)
private fun SimpleFunctionDescriptor.isVisibleAsFunction(): Boolean {
private fun isVisibleAsFunction(function: SimpleFunctionDescriptor): Boolean {
// Do not load Java annotation methods as Kotlin functions (load them as properties instead)
if (jClass.isAnnotationType) return false
if (getPropertyNamesCandidatesByAccessorName(name).any {
if (getPropertyNamesCandidatesByAccessorName(function.name).any {
propertyName ->
getPropertiesFromSupertypes(propertyName).any {
property ->
doesClassOverridesProperty(property) && (property.isVar || !JvmAbi.isSetterName(name.asString()))
doesClassOverridesProperty(property) && (property.isVar || !JvmAbi.isSetterName(function.name.asString()))
}
}) return false
if (this.doesOverrideRenamedBuiltins()) {
if (function.doesOverrideRenamedBuiltins()) {
return false
}
if (name.sameAsBuiltinMethodWithErasedValueParameters && hasOverriddenBuiltinFunctionWithErasedValueParameters(this)) {
if (function.name.sameAsBuiltinMethodWithErasedValueParameters && hasOverriddenBuiltinFunctionWithErasedValueParameters(function)) {
return false
}
@@ -230,7 +230,7 @@ public class LazyJavaClassMemberScope(
result.addIfNotNull(
createOverrideForBuiltinFunctionWithErasedParameterIfNeeded(overridden)
?.check { override -> override.isVisibleAsFunction() })
?.check { override -> isVisibleAsFunction(override) })
}
}