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

Rename Java scopes to reduce confusion

Browse Source
This commit is contained in:
Alexander Udalov
2015-07-30 16:42:28 +03:00
parent a336e9c930
commit 8556f18ed5
5 changed files with 12 additions and 12 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
+5 -5
View File
@@ -52,7 +52,7 @@ public class LazyJavaClassMemberScope(
c: LazyJavaResolverContext,
containingDeclaration: ClassDescriptor,
private val jClass: JavaClass
) : LazyJavaMemberScope(c, containingDeclaration) {
) : LazyJavaScope(c, containingDeclaration) {
override fun computeMemberIndex(): MemberIndex {
return object : ClassMemberIndex(jClass, { !it.isStatic() }) {
@@ -112,7 +112,7 @@ public class LazyJavaClassMemberScope(
propertyDescriptor.initialize(getter, null)
val returnType = computeMethodReturnType(method, annotations, c.child(propertyDescriptor, method))
propertyDescriptor.setType(returnType, listOf(), getDispatchReceiverParameter(), null : JetType?)
propertyDescriptor.setType(returnType, listOf(), getDispatchReceiverParameter(), null as JetType?)
getter.initialize(returnType)
result.add(propertyDescriptor)
@@ -126,8 +126,8 @@ public class LazyJavaClassMemberScope(
override fun resolveMethodSignature(
method: JavaMethod, methodTypeParameters: List<TypeParameterDescriptor>, returnType: JetType,
valueParameters: LazyJavaMemberScope.ResolvedValueParameters
): LazyJavaMemberScope.MethodSignatureData {
valueParameters: LazyJavaScope.ResolvedValueParameters
): LazyJavaScope.MethodSignatureData {
val propagated = c.externalSignatureResolver.resolvePropagatedSignature(
method, getContainingDeclaration(), returnType, null, valueParameters.descriptors, methodTypeParameters
)
@@ -137,7 +137,7 @@ public class LazyJavaClassMemberScope(
propagated.hasStableParameterNames()
)
return LazyJavaMemberScope.MethodSignatureData(effectiveSignature, propagated.getErrors() + effectiveSignature.getErrors())
return LazyJavaScope.MethodSignatureData(effectiveSignature, propagated.getErrors() + effectiveSignature.getErrors())
}
private fun resolveConstructor(constructor: JavaConstructor): JavaConstructorDescriptor {
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt
+1 -1
View File
@@ -25,7 +25,7 @@ class LazyJavaPackageFragment(
private val c: LazyJavaResolverContext,
private val jPackage: JavaPackage
) : PackageFragmentDescriptorImpl(c.module, jPackage.getFqName()) {
private val scope by lazy { LazyPackageFragmentScopeForJavaPackage(c, jPackage, this) }
private val scope by lazy { LazyJavaPackageScope(c, jPackage, this) }
private val topLevelClasses = c.storageManager.createMemoizedFunctionWithNullableValues {
javaClass: JavaClass ->
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt → core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt
+1 -1
View File
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.resolve.scopes.JetScope
import org.jetbrains.kotlin.resolve.scopes.UsageLocation
import org.jetbrains.kotlin.utils.addIfNotNull
public class LazyPackageFragmentScopeForJavaPackage(
public class LazyJavaPackageScope(
c: LazyJavaResolverContext,
private val jPackage: JavaPackage,
containingDeclaration: LazyJavaPackageFragment
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaMemberScope.kt → core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt
+1 -1
View File
@@ -50,7 +50,7 @@ import org.jetbrains.kotlin.utils.toReadOnlyList
import java.util.ArrayList
import java.util.LinkedHashSet
public abstract class LazyJavaMemberScope(
public abstract class LazyJavaScope(
protected val c: LazyJavaResolverContext,
private val containingDeclaration: DeclarationDescriptor
) : JetScopeImpl() {
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticScope.kt
+4 -4
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.types.JetType
public abstract class LazyJavaStaticScope(
c: LazyJavaResolverContext,
descriptor: ClassOrPackageFragmentDescriptor
) : LazyJavaMemberScope(c, descriptor) {
) : LazyJavaScope(c, descriptor) {
override fun getDispatchReceiverParameter() = null
@@ -41,11 +41,11 @@ public abstract class LazyJavaStaticScope(
override fun resolveMethodSignature(
method: JavaMethod, methodTypeParameters: List<TypeParameterDescriptor>, returnType: JetType,
valueParameters: LazyJavaMemberScope.ResolvedValueParameters
): LazyJavaMemberScope.MethodSignatureData {
valueParameters: LazyJavaScope.ResolvedValueParameters
): LazyJavaScope.MethodSignatureData {
val effectiveSignature = c.externalSignatureResolver.resolveAlternativeMethodSignature(
method, false, returnType, null, valueParameters.descriptors, methodTypeParameters, false)
return LazyJavaMemberScope.MethodSignatureData(effectiveSignature, effectiveSignature.getErrors())
return LazyJavaScope.MethodSignatureData(effectiveSignature, effectiveSignature.getErrors())
}
override fun computeNonDeclaredProperties(name: Name, result: MutableCollection<PropertyDescriptor>) {