Pass PlatformToKotlinClassMap instance to PlatformTypesMappedToKotlinChecker

The purpose of this change is to allow PlatformToKotlinClassMap to be removed
from ModuleDescriptor
This commit is contained in:
Alexander Udalov
2016-10-05 17:53:44 +03:00
parent 0360d0e4f6
commit b77388bd48
7 changed files with 42 additions and 27 deletions
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.resolve.jvm.platform
import org.jetbrains.kotlin.container.StorageComponentContainer
import org.jetbrains.kotlin.container.useImpl
import org.jetbrains.kotlin.container.useInstance
import org.jetbrains.kotlin.platform.JavaToKotlinClassMap
import org.jetbrains.kotlin.resolve.PlatformConfigurator
import org.jetbrains.kotlin.resolve.jvm.JvmOverloadFilter
import org.jetbrains.kotlin.resolve.jvm.JvmTypeSpecificityComparator
@@ -73,9 +74,10 @@ object JvmPlatformConfigurator : PlatformConfigurator(
identifierChecker = JvmSimpleNameBacktickChecker,
overloadFilter = JvmOverloadFilter
) {
overloadFilter = JvmOverloadFilter,
platformToKotlinClassMap = JavaToKotlinClassMap.INSTANCE
) {
override fun configureModuleComponents(container: StorageComponentContainer) {
container.useImpl<ReflectionAPICallChecker>()
container.useImpl<JavaSyntheticScopes>()