Minor, rename packageFacadeProvider -> packagePartProvider
This commit is contained in:
+1
-1
@@ -144,7 +144,7 @@ abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdir() {
|
|||||||
|
|
||||||
private fun createReflectedPackageView(classLoader: URLClassLoader, moduleName: String): SyntheticPackageViewForTest {
|
private fun createReflectedPackageView(classLoader: URLClassLoader, moduleName: String): SyntheticPackageViewForTest {
|
||||||
val moduleData = RuntimeModuleData.create(classLoader)
|
val moduleData = RuntimeModuleData.create(classLoader)
|
||||||
moduleData.packageFacadeProvider.registerModule(moduleName)
|
moduleData.packagePartProvider.registerModule(moduleName)
|
||||||
val module = moduleData.module
|
val module = moduleData.module
|
||||||
|
|
||||||
val generatedPackageDir = File(tmpdir, LoadDescriptorUtil.TEST_PACKAGE_FQNAME.pathSegments().single().asString())
|
val generatedPackageDir = File(tmpdir, LoadDescriptorUtil.TEST_PACKAGE_FQNAME.pathSegments().single().asString())
|
||||||
|
|||||||
+7
-4
@@ -38,7 +38,10 @@ import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfigu
|
|||||||
import org.jetbrains.kotlin.serialization.deserialization.NotFoundClasses
|
import org.jetbrains.kotlin.serialization.deserialization.NotFoundClasses
|
||||||
import org.jetbrains.kotlin.storage.LockBasedStorageManager
|
import org.jetbrains.kotlin.storage.LockBasedStorageManager
|
||||||
|
|
||||||
class RuntimeModuleData private constructor(val deserialization: DeserializationComponents, val packageFacadeProvider: RuntimePackagePartProvider) {
|
class RuntimeModuleData private constructor(
|
||||||
|
val deserialization: DeserializationComponents,
|
||||||
|
val packagePartProvider: RuntimePackagePartProvider
|
||||||
|
) {
|
||||||
val module: ModuleDescriptor get() = deserialization.moduleDescriptor
|
val module: ModuleDescriptor get() = deserialization.moduleDescriptor
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
@@ -50,13 +53,13 @@ class RuntimeModuleData private constructor(val deserialization: Deserialization
|
|||||||
val reflectKotlinClassFinder = ReflectKotlinClassFinder(classLoader)
|
val reflectKotlinClassFinder = ReflectKotlinClassFinder(classLoader)
|
||||||
val deserializedDescriptorResolver = DeserializedDescriptorResolver()
|
val deserializedDescriptorResolver = DeserializedDescriptorResolver()
|
||||||
val singleModuleClassResolver = SingleModuleClassResolver()
|
val singleModuleClassResolver = SingleModuleClassResolver()
|
||||||
val runtimePackageFacadeProvider = RuntimePackagePartProvider(classLoader)
|
val runtimePackagePartProvider = RuntimePackagePartProvider(classLoader)
|
||||||
val javaResolverCache = JavaResolverCache.EMPTY
|
val javaResolverCache = JavaResolverCache.EMPTY
|
||||||
val globalJavaResolverContext = JavaResolverComponents(
|
val globalJavaResolverContext = JavaResolverComponents(
|
||||||
storageManager, ReflectJavaClassFinder(classLoader), reflectKotlinClassFinder, deserializedDescriptorResolver,
|
storageManager, ReflectJavaClassFinder(classLoader), reflectKotlinClassFinder, deserializedDescriptorResolver,
|
||||||
ExternalAnnotationResolver.EMPTY, SignaturePropagator.DO_NOTHING, RuntimeErrorReporter, javaResolverCache,
|
ExternalAnnotationResolver.EMPTY, SignaturePropagator.DO_NOTHING, RuntimeErrorReporter, javaResolverCache,
|
||||||
JavaPropertyInitializerEvaluator.DoNothing, SamConversionResolver, RuntimeSourceElementFactory, singleModuleClassResolver,
|
JavaPropertyInitializerEvaluator.DoNothing, SamConversionResolver, RuntimeSourceElementFactory, singleModuleClassResolver,
|
||||||
runtimePackageFacadeProvider, SupertypeLoopChecker.EMPTY, LookupTracker.DO_NOTHING, module, ReflectionTypes(module)
|
runtimePackagePartProvider, SupertypeLoopChecker.EMPTY, LookupTracker.DO_NOTHING, module, ReflectionTypes(module)
|
||||||
)
|
)
|
||||||
|
|
||||||
val lazyJavaPackageFragmentProvider = LazyJavaPackageFragmentProvider(globalJavaResolverContext)
|
val lazyJavaPackageFragmentProvider = LazyJavaPackageFragmentProvider(globalJavaResolverContext)
|
||||||
@@ -81,7 +84,7 @@ class RuntimeModuleData private constructor(val deserialization: Deserialization
|
|||||||
module.setDependencies(module, builtIns.builtInsModule)
|
module.setDependencies(module, builtIns.builtInsModule)
|
||||||
module.initialize(javaDescriptorResolver.packageFragmentProvider)
|
module.initialize(javaDescriptorResolver.packageFragmentProvider)
|
||||||
|
|
||||||
return RuntimeModuleData(deserializationComponentsForJava.components, runtimePackageFacadeProvider)
|
return RuntimeModuleData(deserializationComponentsForJava.components, runtimePackagePartProvider)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ internal class KPackageImpl(override val jClass: Class<*>, val moduleName: Strin
|
|||||||
private inner class Data : KDeclarationContainerImpl.Data() {
|
private inner class Data : KDeclarationContainerImpl.Data() {
|
||||||
val descriptor: PackageViewDescriptor by ReflectProperties.lazySoft {
|
val descriptor: PackageViewDescriptor by ReflectProperties.lazySoft {
|
||||||
with(moduleData) {
|
with(moduleData) {
|
||||||
packageFacadeProvider.registerModule(moduleName)
|
packagePartProvider.registerModule(moduleName)
|
||||||
module.getPackage(jClass.classId.packageFqName)
|
module.getPackage(jClass.classId.packageFqName)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user