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

Minor, merge two sematically identical functions

Browse Source
This commit is contained in:
Alexander Udalov
2014-10-29 12:13:07 +03:00
parent 4350da5f24
commit ae78b0e216
3 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt
-3
View File
@@ -37,7 +37,6 @@ import org.jetbrains.jet.lang.resolve.java.descriptor.JavaConstructorDescriptor
import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils
import org.jetbrains.jet.lang.types.JetType
import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.LazyJavaMemberScope.MethodSignatureData
import org.jetbrains.jet.lang.resolve.java.PLATFORM_TYPES
public class LazyJavaClassMemberScope(
c: LazyJavaResolverContextWithTypes,
@@ -85,8 +84,6 @@ public class LazyJavaClassMemberScope(
c.errorReporter))
}
override fun computeAdditionalFunctions(name: Name) = listOf<SimpleFunctionDescriptor>()
private fun getPropertiesFromSupertypes(name: Name, descriptor: ClassDescriptor): Set<PropertyDescriptor> {
return descriptor.getTypeConstructor().getSupertypes().flatMap {
it.getMemberScope().getProperties(name).map { p -> p as PropertyDescriptor }
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt
-3
View File
@@ -72,8 +72,6 @@ public abstract class LazyJavaMemberScope(
protected abstract fun getDispatchReceiverParameter(): ReceiverParameterDescriptor?
protected abstract fun computeAdditionalFunctions(name: Name): Collection<SimpleFunctionDescriptor>
private val _functions = c.storageManager.createMemoizedFunction {
(name: Name): Collection<FunctionDescriptor> ->
val methods = memberIndex().findMethodsByName(name)
@@ -88,7 +86,6 @@ public abstract class LazyJavaMemberScope(
else
listOf(function).stream()
}
.plus(computeAdditionalFunctions(name))
.toList()
)
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt
+7 -12
View File
@@ -110,8 +110,6 @@ public class LazyPackageFragmentScopeForJavaPackage(
override fun getAllMethodNames(): Collection<Name> = getAllClassNames()
}
override fun computeAdditionalFunctions(name: Name) = listOf<SimpleFunctionDescriptor>()
override fun getAllClassNames(): Collection<Name> {
return jPackage.getClasses().stream()
.filter { c -> c.getOriginKind() != JavaClass.OriginKind.KOTLIN_LIGHT_CLASS }
@@ -160,16 +158,6 @@ public class LazyJavaStaticClassScope(
return super.getAllFunctionNames()
}
override fun computeAdditionalFunctions(name: Name): Collection<SimpleFunctionDescriptor> {
if (jClass.isEnum()) {
when (name) {
DescriptorUtils.ENUM_VALUE_OF -> return listOf(createEnumValueOfMethod(getContainingDeclaration()))
DescriptorUtils.ENUM_VALUES -> return listOf(createEnumValuesMethod(getContainingDeclaration()))
}
}
return listOf()
}
override fun getAllClassNames(): Collection<Name> = listOf()
override fun getClassifier(name: Name): ClassifierDescriptor? = null
@@ -178,6 +166,13 @@ public class LazyJavaStaticClassScope(
override fun computeNonDeclaredFunctions(result: MutableCollection<SimpleFunctionDescriptor>, name: Name) {
val nestedClassesScope = getContainingDeclaration().getUnsubstitutedInnerClassesScope()
result.addIfNotNull(c.samConversionResolver.resolveSamConstructor(name, nestedClassesScope))
if (jClass.isEnum()) {
when (name) {
DescriptorUtils.ENUM_VALUE_OF -> result.add(createEnumValueOfMethod(getContainingDeclaration()))
DescriptorUtils.ENUM_VALUES -> result.add(createEnumValuesMethod(getContainingDeclaration()))
}
}
}
override fun getContainingDeclaration() = super.getContainingDeclaration() as LazyJavaClassDescriptor