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

JS: use new DefaultBuiltIns instance instead of anonymous

Browse Source
This commit is contained in:
Alexander Udalov
2019-01-25 16:01:33 +01:00
parent cb6fb78bc3
commit 74dd99a8da
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.kt
+3 -4
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.js.analyze package org.jetbrains.kotlin.js.analyze
import com.intellij.openapi.project.Project 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.builtins.functions.functionInterfacePackageFragmentProvider
import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.config.CommonConfigurationKeys
import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfiguration
@@ -55,17 +55,16 @@ object TopDownAnalyzerFacadeForJS {
require(!thisIsBuiltInsModule || customBuiltInsModule == null) { require(!thisIsBuiltInsModule || customBuiltInsModule == null) {
"Can't simultaneously use custom built-ins module and set current module as built-ins" "Can't simultaneously use custom built-ins module and set current module as built-ins"
} }
val projectContext = ProjectContext(project)
val builtIns = when { val builtIns = when {
thisIsBuiltInsModule -> object : KotlinBuiltIns(projectContext.storageManager) {} thisIsBuiltInsModule -> DefaultBuiltIns(loadBuiltInsFromCurrentClassLoader = false)
customBuiltInsModule != null -> customBuiltInsModule.builtIns customBuiltInsModule != null -> customBuiltInsModule.builtIns
else -> JsPlatform.builtIns else -> JsPlatform.builtIns
} }
val moduleName = configuration[CommonConfigurationKeys.MODULE_NAME]!! val moduleName = configuration[CommonConfigurationKeys.MODULE_NAME]!!
val context = ContextForNewModule( val context = ContextForNewModule(
projectContext, ProjectContext(project),
Name.special("<$moduleName>"), Name.special("<$moduleName>"),
builtIns, builtIns,
multiTargetPlatform = null multiTargetPlatform = null