JS: use new DefaultBuiltIns instance instead of anonymous
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
package org.jetbrains.kotlin.js.analyze
|
||||
|
||||
import com.intellij.openapi.project.Project
|
||||
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
|
||||
import org.jetbrains.kotlin.builtins.DefaultBuiltIns
|
||||
import org.jetbrains.kotlin.builtins.functions.functionInterfacePackageFragmentProvider
|
||||
import org.jetbrains.kotlin.config.CommonConfigurationKeys
|
||||
import org.jetbrains.kotlin.config.CompilerConfiguration
|
||||
@@ -55,17 +55,16 @@ object TopDownAnalyzerFacadeForJS {
|
||||
require(!thisIsBuiltInsModule || customBuiltInsModule == null) {
|
||||
"Can't simultaneously use custom built-ins module and set current module as built-ins"
|
||||
}
|
||||
val projectContext = ProjectContext(project)
|
||||
|
||||
val builtIns = when {
|
||||
thisIsBuiltInsModule -> object : KotlinBuiltIns(projectContext.storageManager) {}
|
||||
thisIsBuiltInsModule -> DefaultBuiltIns(loadBuiltInsFromCurrentClassLoader = false)
|
||||
customBuiltInsModule != null -> customBuiltInsModule.builtIns
|
||||
else -> JsPlatform.builtIns
|
||||
}
|
||||
|
||||
val moduleName = configuration[CommonConfigurationKeys.MODULE_NAME]!!
|
||||
val context = ContextForNewModule(
|
||||
projectContext,
|
||||
ProjectContext(project),
|
||||
Name.special("<$moduleName>"),
|
||||
builtIns,
|
||||
multiTargetPlatform = null
|
||||
|
||||
Reference in New Issue
Block a user