From f39165bb589c4dd1e075dc995e6a631fe67a6ad7 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 26 May 2020 16:10:58 +0300 Subject: [PATCH] Revert accidentally pushed changes Revert "~~~" This reverts commit 03fcbfad Revert "Add an ability to provide own handler for errors inside KotlinJavascriptMetadataUtils.loadMetadata" This reverts commit 69827fc5 Revert "Add more detailed message for EA-227305 and EA-226744" This reverts commit b79b3507 --- .../kotlin/caches/resolve/JsResolverForModuleFactory.kt | 5 +---- .../kotlin/utils/KotlinJavascriptMetadataUtils.kt | 9 +++------ .../kotlin/js/descriptorUtils/descriptorUtils.kt | 4 +--- .../test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt | 2 +- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JsResolverForModuleFactory.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JsResolverForModuleFactory.kt index 549c77cf43f..4d036e712e2 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JsResolverForModuleFactory.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JsResolverForModuleFactory.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.caches.resolve -import com.intellij.openapi.diagnostic.Logger import org.jetbrains.kotlin.analyzer.* import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.container.StorageComponentContainer @@ -27,8 +26,6 @@ import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil import org.jetbrains.kotlin.serialization.js.createKotlinJavascriptPackageFragmentProvider import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils -private val LOG = Logger.getInstance(JsResolverForModuleFactory::class.java) - class JsResolverForModuleFactory( private val targetEnvironment: TargetEnvironment ) : ResolverForModuleFactory() { @@ -88,7 +85,7 @@ internal fun createPackageFragmentProvider( } is LibraryModuleInfo -> { moduleInfo.getLibraryRoots() - .flatMap { KotlinJavascriptMetadataUtils.loadMetadata(it, LOG::error) } + .flatMap { KotlinJavascriptMetadataUtils.loadMetadata(it) } .filter { it.version.isCompatible() } .map { metadata -> val (header, packageFragmentProtos) = diff --git a/js/js.config/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt b/js/js.config/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt index 4eea9f28599..10668c725d3 100644 --- a/js/js.config/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt +++ b/js/js.config/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt @@ -65,11 +65,8 @@ object KotlinJavascriptMetadataUtils { "\"${Base64.getEncoder().encodeToString(content)}\");\n" @JvmStatic - fun loadMetadata(file: File, onError: (message: String) -> Unit = ::error): List { - if (!file.exists()) { - onError("Library $file not found") - return emptyList() - } + fun loadMetadata(file: File): List { + assert(file.exists()) { "Library $file not found" } val metadataList = arrayListOf() JsLibraryUtils.traverseJsLibrary(file) { library -> parseMetadata(library.content, metadataList) @@ -79,7 +76,7 @@ object KotlinJavascriptMetadataUtils { } @JvmStatic - fun loadMetadata(path: String, onError: (message: String) -> Unit): List = loadMetadata(File(path), onError) + fun loadMetadata(path: String): List = loadMetadata(File(path)) @JvmStatic fun parseMetadata(text: CharSequence, metadataList: MutableList) { diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/descriptorUtils/descriptorUtils.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/descriptorUtils/descriptorUtils.kt index 0805753abc7..0a1d7fad966 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/descriptorUtils/descriptorUtils.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/descriptorUtils/descriptorUtils.kt @@ -20,9 +20,7 @@ val KotlinType.nameIfStandardType: Name? get() = constructor.declarationDescriptor?.takeIf(KotlinBuiltIns::isBuiltIn)?.name fun KotlinType.getJetTypeFqName(printTypeArguments: Boolean): String { - val declaration = requireNotNull(constructor.declarationDescriptor) { - "declarationDescriptor is null for constructor = $constructor with ${constructor.javaClass}" - } + val declaration = requireNotNull(constructor.declarationDescriptor) if (declaration is TypeParameterDescriptor) { return StringUtil.join(declaration.upperBounds, { type -> type.getJetTypeFqName(printTypeArguments) }, "&") } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt index 0599b4c8310..cc12c1dd553 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt @@ -881,7 +881,7 @@ abstract class BasicBoxTest( companion object { val METADATA_CACHE = (JsConfig.JS_STDLIB + JsConfig.JS_KOTLIN_TEST).flatMap { path -> - KotlinJavascriptMetadataUtils.loadMetadata(path, ::error).map { metadata -> + KotlinJavascriptMetadataUtils.loadMetadata(path).map { metadata -> val parts = KotlinJavascriptSerializationUtil.readModuleAsProto(metadata.body, metadata.version) JsModuleDescriptor(metadata.moduleName, parts.kind, parts.importedModules, parts) }