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
|
||||
|
||||
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 <M : ModuleInfo> createPackageFragmentProvider(
|
||||
}
|
||||
is LibraryModuleInfo -> {
|
||||
moduleInfo.getLibraryRoots()
|
||||
.flatMap { KotlinJavascriptMetadataUtils.loadMetadata(it, LOG::error) }
|
||||
.flatMap { KotlinJavascriptMetadataUtils.loadMetadata(it) }
|
||||
.filter { it.version.isCompatible() }
|
||||
.map { metadata ->
|
||||
val (header, packageFragmentProtos) =
|
||||
|
||||
Reference in New Issue
Block a user