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

Minor, move module property to LazyJavaResolverContext

Browse Source 
All usages of LazyJavaPackageFragmentProvider.module
got it through LazyJavaResolverContext
This commit is contained in:
Denis Zharkov
2015-04-08 16:03:54 +03:00
parent f942f6ac8e
commit 07a4e8a405
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt
+2 -2
View File
@@ -28,10 +28,10 @@ import org.jetbrains.kotlin.utils.emptyOrSingletonList
public class LazyJavaPackageFragmentProvider( public class LazyJavaPackageFragmentProvider(
outerContext: GlobalJavaResolverContext, outerContext: GlobalJavaResolverContext,
val module: ModuleDescriptor module: ModuleDescriptor
) : PackageFragmentProvider { ) : PackageFragmentProvider {
private val c = LazyJavaResolverContext(outerContext, this, FragmentClassResolver(), TypeParameterResolver.EMPTY) private val c = LazyJavaResolverContext(outerContext, this, FragmentClassResolver(), module, TypeParameterResolver.EMPTY)
private val packageFragments: MemoizedFunctionToNullable<FqName, LazyJavaPackageFragment> = private val packageFragments: MemoizedFunctionToNullable<FqName, LazyJavaPackageFragment> =
c.storageManager.createMemoizedFunctionWithNullableValues { c.storageManager.createMemoizedFunctionWithNullableValues {
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt
+3 -1
View File
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.load.java.lazy
import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.storage.StorageManager
import org.jetbrains.kotlin.load.java.lazy.types.LazyJavaTypeResolver import org.jetbrains.kotlin.load.java.lazy.types.LazyJavaTypeResolver
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.load.java.JavaClassFinder import org.jetbrains.kotlin.load.java.JavaClassFinder
import org.jetbrains.kotlin.load.java.components.* import org.jetbrains.kotlin.load.java.components.*
import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver
@@ -48,6 +49,7 @@ open class LazyJavaResolverContext(
globalContext: GlobalJavaResolverContext, globalContext: GlobalJavaResolverContext,
val packageFragmentProvider: LazyJavaPackageFragmentProvider, val packageFragmentProvider: LazyJavaPackageFragmentProvider,
val javaClassResolver: LazyJavaClassResolver, val javaClassResolver: LazyJavaClassResolver,
val module: ModuleDescriptor,
val typeParameterResolver: TypeParameterResolver val typeParameterResolver: TypeParameterResolver
) : GlobalJavaResolverContext( ) : GlobalJavaResolverContext(
globalContext.storageManager, globalContext.storageManager,
@@ -69,7 +71,7 @@ open class LazyJavaResolverContext(
fun LazyJavaResolverContext.child( fun LazyJavaResolverContext.child(
typeParameterResolver: TypeParameterResolver typeParameterResolver: TypeParameterResolver
) = LazyJavaResolverContext(this, packageFragmentProvider, javaClassResolver, typeParameterResolver) ) = LazyJavaResolverContext(this, packageFragmentProvider, javaClassResolver, module, typeParameterResolver)
fun LazyJavaResolverContext.child( fun LazyJavaResolverContext.child(
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt
+1 -1
View File
@@ -151,7 +151,7 @@ class LazyJavaAnnotationDescriptor(
TypeUsage.MEMBER_SIGNATURE_INVARIANT.toAttributes(allowFlexible = false)) TypeUsage.MEMBER_SIGNATURE_INVARIANT.toAttributes(allowFlexible = false))
) )
val jlClass = c.packageFragmentProvider.module.resolveTopLevelClass(FqName("java.lang.Class")) val jlClass = c.module.resolveTopLevelClass(FqName("java.lang.Class"))
if (jlClass == null) return null if (jlClass == null) return null
val arguments = listOf(TypeProjectionImpl(type)) val arguments = listOf(TypeProjectionImpl(type))
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import kotlin.properties.Delegates
class LazyJavaPackageFragment( class LazyJavaPackageFragment(
private val c: LazyJavaResolverContext, private val c: LazyJavaResolverContext,
private val jPackage: JavaPackage private val jPackage: JavaPackage
) : PackageFragmentDescriptorImpl(c.packageFragmentProvider.module, jPackage.getFqName()) { ) : PackageFragmentDescriptorImpl(c.module, jPackage.getFqName()) {
private val scope by Delegates.lazy { LazyPackageFragmentScopeForJavaPackage(c, jPackage, this) } private val scope by Delegates.lazy { LazyPackageFragmentScopeForJavaPackage(c, jPackage, this) }
override fun getMemberScope() = scope override fun getMemberScope() = scope