Move PlatformToKotlinClassMap out from ModuleParameters
Configure it in the same way as other platform-specific components instead, simplify some code
This commit is contained in:
@@ -19,8 +19,6 @@ package org.jetbrains.kotlin.resolve.jvm.platform
|
||||
import org.jetbrains.kotlin.builtins.DefaultBuiltIns
|
||||
import org.jetbrains.kotlin.descriptors.ModuleParameters
|
||||
import org.jetbrains.kotlin.name.FqName
|
||||
import org.jetbrains.kotlin.platform.JavaToKotlinClassMap
|
||||
import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap
|
||||
import org.jetbrains.kotlin.resolve.DescriptorUtils
|
||||
import org.jetbrains.kotlin.resolve.ImportPath
|
||||
import org.jetbrains.kotlin.resolve.PlatformConfigurator
|
||||
@@ -31,8 +29,6 @@ import java.util.*
|
||||
|
||||
object JvmPlatform : TargetPlatform("JVM") {
|
||||
override val defaultModuleParameters = object : ModuleParameters {
|
||||
override val platformToKotlinClassMap: PlatformToKotlinClassMap
|
||||
get() = JavaToKotlinClassMap.INSTANCE
|
||||
override val defaultImports: List<ImportPath>
|
||||
get() = DEFAULT_IMPORTS_FOR_JVM
|
||||
override val excludedImports: List<FqName>
|
||||
|
||||
@@ -23,7 +23,6 @@ import org.jetbrains.kotlin.descriptors.ModuleParameters
|
||||
import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
|
||||
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
|
||||
import org.jetbrains.kotlin.name.Name
|
||||
import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap
|
||||
import org.jetbrains.kotlin.resolve.TargetPlatform
|
||||
import org.jetbrains.kotlin.resolve.createModule
|
||||
import org.jetbrains.kotlin.storage.ExceptionTracker
|
||||
@@ -41,9 +40,6 @@ interface ProjectContext : GlobalContext {
|
||||
|
||||
interface ModuleContext : ProjectContext {
|
||||
val module: ModuleDescriptor
|
||||
|
||||
val platformToKotlinClassMap: PlatformToKotlinClassMap
|
||||
get() = module.platformToKotlinClassMap
|
||||
}
|
||||
|
||||
interface MutableModuleContext: ModuleContext {
|
||||
|
||||
@@ -40,7 +40,6 @@ fun StorageComponentContainer.configureModule(
|
||||
useInstance(moduleContext.project)
|
||||
useInstance(moduleContext.storageManager)
|
||||
useInstance(moduleContext.module.builtIns)
|
||||
useInstance(moduleContext.platformToKotlinClassMap)
|
||||
|
||||
useInstance(platform)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user