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

Minor, rename packageFacadeProvider -> packagePartProvider

Browse Source
This commit is contained in:
Alexander Udalov
2017-02-07 15:27:39 +03:00
parent 131570080d
commit 8a79482c5c
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt
+1 -1
View File
@@ -144,7 +144,7 @@ abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdir() {
private fun createReflectedPackageView(classLoader: URLClassLoader, moduleName: String): SyntheticPackageViewForTest {
val moduleData = RuntimeModuleData.create(classLoader)
moduleData.packageFacadeProvider.registerModule(moduleName)
moduleData.packagePartProvider.registerModule(moduleName)
val module = moduleData.module
val generatedPackageDir = File(tmpdir, LoadDescriptorUtil.TEST_PACKAGE_FQNAME.pathSegments().single().asString())
core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimeModuleData.kt
+7 -4
View File
@@ -38,7 +38,10 @@ import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfigu
import org.jetbrains.kotlin.serialization.deserialization.NotFoundClasses
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
companion object {
@@ -50,13 +53,13 @@ class RuntimeModuleData private constructor(val deserialization: Deserialization
val reflectKotlinClassFinder = ReflectKotlinClassFinder(classLoader)
val deserializedDescriptorResolver = DeserializedDescriptorResolver()
val singleModuleClassResolver = SingleModuleClassResolver()
val runtimePackageFacadeProvider = RuntimePackagePartProvider(classLoader)
val runtimePackagePartProvider = RuntimePackagePartProvider(classLoader)
val javaResolverCache = JavaResolverCache.EMPTY
val globalJavaResolverContext = JavaResolverComponents(
storageManager, ReflectJavaClassFinder(classLoader), reflectKotlinClassFinder, deserializedDescriptorResolver,
ExternalAnnotationResolver.EMPTY, SignaturePropagator.DO_NOTHING, RuntimeErrorReporter, javaResolverCache,
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)
@@ -81,7 +84,7 @@ class RuntimeModuleData private constructor(val deserialization: Deserialization
module.setDependencies(module, builtIns.builtInsModule)
module.initialize(javaDescriptorResolver.packageFragmentProvider)
return RuntimeModuleData(deserializationComponentsForJava.components, runtimePackageFacadeProvider)
return RuntimeModuleData(deserializationComponentsForJava.components, runtimePackagePartProvider)
}
}
}
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt
+1 -1
View File
@@ -32,7 +32,7 @@ internal class KPackageImpl(override val jClass: Class<*>, val moduleName: Strin
private inner class Data : KDeclarationContainerImpl.Data() {
val descriptor: PackageViewDescriptor by ReflectProperties.lazySoft {
with(moduleData) {
packageFacadeProvider.registerModule(moduleName)
packagePartProvider.registerModule(moduleName)
module.getPackage(jClass.classId.packageFqName)
}
}