Revert accidentally pushed changes
Revert "~~~" This reverts commit03fcbfadRevert "Add an ability to provide own handler for errors inside KotlinJavascriptMetadataUtils.loadMetadata" This reverts commit69827fc5Revert "Add more detailed message for EA-227305 and EA-226744" This reverts commitb79b3507
This commit is contained in:
+1
-4
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.caches.resolve
|
package org.jetbrains.kotlin.caches.resolve
|
||||||
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import org.jetbrains.kotlin.analyzer.*
|
import org.jetbrains.kotlin.analyzer.*
|
||||||
import org.jetbrains.kotlin.config.LanguageVersionSettings
|
import org.jetbrains.kotlin.config.LanguageVersionSettings
|
||||||
import org.jetbrains.kotlin.container.StorageComponentContainer
|
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.serialization.js.createKotlinJavascriptPackageFragmentProvider
|
||||||
import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils
|
import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils
|
||||||
|
|
||||||
private val LOG = Logger.getInstance(JsResolverForModuleFactory::class.java)
|
|
||||||
|
|
||||||
class JsResolverForModuleFactory(
|
class JsResolverForModuleFactory(
|
||||||
private val targetEnvironment: TargetEnvironment
|
private val targetEnvironment: TargetEnvironment
|
||||||
) : ResolverForModuleFactory() {
|
) : ResolverForModuleFactory() {
|
||||||
@@ -88,7 +85,7 @@ internal fun <M : ModuleInfo> createPackageFragmentProvider(
|
|||||||
}
|
}
|
||||||
is LibraryModuleInfo -> {
|
is LibraryModuleInfo -> {
|
||||||
moduleInfo.getLibraryRoots()
|
moduleInfo.getLibraryRoots()
|
||||||
.flatMap { KotlinJavascriptMetadataUtils.loadMetadata(it, LOG::error) }
|
.flatMap { KotlinJavascriptMetadataUtils.loadMetadata(it) }
|
||||||
.filter { it.version.isCompatible() }
|
.filter { it.version.isCompatible() }
|
||||||
.map { metadata ->
|
.map { metadata ->
|
||||||
val (header, packageFragmentProtos) =
|
val (header, packageFragmentProtos) =
|
||||||
|
|||||||
@@ -65,11 +65,8 @@ object KotlinJavascriptMetadataUtils {
|
|||||||
"\"${Base64.getEncoder().encodeToString(content)}\");\n"
|
"\"${Base64.getEncoder().encodeToString(content)}\");\n"
|
||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun loadMetadata(file: File, onError: (message: String) -> Unit = ::error): List<KotlinJavascriptMetadata> {
|
fun loadMetadata(file: File): List<KotlinJavascriptMetadata> {
|
||||||
if (!file.exists()) {
|
assert(file.exists()) { "Library $file not found" }
|
||||||
onError("Library $file not found")
|
|
||||||
return emptyList()
|
|
||||||
}
|
|
||||||
val metadataList = arrayListOf<KotlinJavascriptMetadata>()
|
val metadataList = arrayListOf<KotlinJavascriptMetadata>()
|
||||||
JsLibraryUtils.traverseJsLibrary(file) { library ->
|
JsLibraryUtils.traverseJsLibrary(file) { library ->
|
||||||
parseMetadata(library.content, metadataList)
|
parseMetadata(library.content, metadataList)
|
||||||
@@ -79,7 +76,7 @@ object KotlinJavascriptMetadataUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun loadMetadata(path: String, onError: (message: String) -> Unit): List<KotlinJavascriptMetadata> = loadMetadata(File(path), onError)
|
fun loadMetadata(path: String): List<KotlinJavascriptMetadata> = loadMetadata(File(path))
|
||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun parseMetadata(text: CharSequence, metadataList: MutableList<KotlinJavascriptMetadata>) {
|
fun parseMetadata(text: CharSequence, metadataList: MutableList<KotlinJavascriptMetadata>) {
|
||||||
|
|||||||
@@ -20,9 +20,7 @@ val KotlinType.nameIfStandardType: Name?
|
|||||||
get() = constructor.declarationDescriptor?.takeIf(KotlinBuiltIns::isBuiltIn)?.name
|
get() = constructor.declarationDescriptor?.takeIf(KotlinBuiltIns::isBuiltIn)?.name
|
||||||
|
|
||||||
fun KotlinType.getJetTypeFqName(printTypeArguments: Boolean): String {
|
fun KotlinType.getJetTypeFqName(printTypeArguments: Boolean): String {
|
||||||
val declaration = requireNotNull(constructor.declarationDescriptor) {
|
val declaration = requireNotNull(constructor.declarationDescriptor)
|
||||||
"declarationDescriptor is null for constructor = $constructor with ${constructor.javaClass}"
|
|
||||||
}
|
|
||||||
if (declaration is TypeParameterDescriptor) {
|
if (declaration is TypeParameterDescriptor) {
|
||||||
return StringUtil.join(declaration.upperBounds, { type -> type.getJetTypeFqName(printTypeArguments) }, "&")
|
return StringUtil.join(declaration.upperBounds, { type -> type.getJetTypeFqName(printTypeArguments) }, "&")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -881,7 +881,7 @@ abstract class BasicBoxTest(
|
|||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
val METADATA_CACHE = (JsConfig.JS_STDLIB + JsConfig.JS_KOTLIN_TEST).flatMap { path ->
|
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)
|
val parts = KotlinJavascriptSerializationUtil.readModuleAsProto(metadata.body, metadata.version)
|
||||||
JsModuleDescriptor(metadata.moduleName, parts.kind, parts.importedModules, parts)
|
JsModuleDescriptor(metadata.moduleName, parts.kind, parts.importedModules, parts)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user