From 07a4e8a405d30d0bf687cf4d3117dd4315d85dad Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Wed, 8 Apr 2015 16:03:54 +0300
Subject: [PATCH] Minor, move `module` property to LazyJavaResolverContext

All usages of LazyJavaPackageFragmentProvider.module
got it through LazyJavaResolverContext
---
 .../kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt  | 4 ++--
 .../src/org/jetbrains/kotlin/load/java/lazy/context.kt        | 4 +++-
 .../java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt     | 2 +-
 .../load/java/lazy/descriptors/LazyJavaPackageFragment.kt     | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt
index 8de837e2c4b..26d795e52ee 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt
@@ -28,10 +28,10 @@ import org.jetbrains.kotlin.utils.emptyOrSingletonList
 
 public class LazyJavaPackageFragmentProvider(
         outerContext: GlobalJavaResolverContext,
-        val module: ModuleDescriptor
+        module: ModuleDescriptor
 ) : 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> =
             c.storageManager.createMemoizedFunctionWithNullableValues {
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt
index 8e918dfd2ea..fac774815a0 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.load.java.lazy
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.kotlin.load.java.lazy.types.LazyJavaTypeResolver
 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.components.*
 import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver
@@ -48,6 +49,7 @@ open class LazyJavaResolverContext(
         globalContext: GlobalJavaResolverContext,
         val packageFragmentProvider: LazyJavaPackageFragmentProvider,
         val javaClassResolver: LazyJavaClassResolver,
+        val module: ModuleDescriptor,
         val typeParameterResolver: TypeParameterResolver
 ) : GlobalJavaResolverContext(
         globalContext.storageManager,
@@ -69,7 +71,7 @@ open class LazyJavaResolverContext(
 
 fun LazyJavaResolverContext.child(
         typeParameterResolver: TypeParameterResolver
-) = LazyJavaResolverContext(this, packageFragmentProvider, javaClassResolver, typeParameterResolver)
+) = LazyJavaResolverContext(this, packageFragmentProvider, javaClassResolver, module, typeParameterResolver)
 
 
 fun LazyJavaResolverContext.child(
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt
index df9d9cae57a..ce649f06289 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt
@@ -151,7 +151,7 @@ class LazyJavaAnnotationDescriptor(
                 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
 
         val arguments = listOf(TypeProjectionImpl(type))
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt
index 19ad7448c61..3d11ca55a4a 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt
@@ -24,7 +24,7 @@ import kotlin.properties.Delegates
 class LazyJavaPackageFragment(
         private val c: LazyJavaResolverContext,
         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) }
 
     override fun getMemberScope() = scope