[FIR] Don't load unneeded things

It's confusing to stop at breakpoints
related to these loadings when they aren't
actually used.
This commit is contained in:
Nikolay Lunyak
2023-04-18 09:20:38 +03:00
committed by Space Team
parent 360d236b7e
commit e1158b1cb2
3 changed files with 9 additions and 6 deletions
@@ -70,10 +70,12 @@ class JsEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigu
}
}
private val METADATA_CACHE = (JsConfig.JS_STDLIB + JsConfig.JS_KOTLIN_TEST).flatMap { path ->
KotlinJavascriptMetadataUtils.loadMetadata(path).map { metadata ->
val parts = KotlinJavascriptSerializationUtil.readModuleAsProto(metadata.body, metadata.version)
JsModuleDescriptor(metadata.moduleName, parts.kind, parts.importedModules, parts)
private val METADATA_CACHE by lazy {
(JsConfig.JS_STDLIB + JsConfig.JS_KOTLIN_TEST).flatMap { path ->
KotlinJavascriptMetadataUtils.loadMetadata(path).map { metadata ->
val parts = KotlinJavascriptSerializationUtil.readModuleAsProto(metadata.body, metadata.version)
JsModuleDescriptor(metadata.moduleName, parts.kind, parts.importedModules, parts)
}
}
}
@@ -27,7 +27,8 @@ class DefaultBuiltIns(loadBuiltInsFromCurrentClassLoader: Boolean = true) : Kotl
companion object {
@JvmStatic
val Instance: DefaultBuiltIns =
val Instance: DefaultBuiltIns by lazy {
DefaultBuiltIns()
}
}
}
@@ -20,7 +20,7 @@ object ErrorModuleDescriptor : ModuleDescriptor {
override val expectedByModules: List<ModuleDescriptor> = emptyList()
override val allExpectedByModules: Set<ModuleDescriptor> = emptySet()
override val annotations: Annotations get() = Annotations.EMPTY
override val builtIns: KotlinBuiltIns = DefaultBuiltIns.Instance
override val builtIns: KotlinBuiltIns by lazy { DefaultBuiltIns.Instance }
override val isValid: Boolean = false
override fun <T> getCapability(capability: ModuleCapability<T>): T? = null