diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/CommonPlatformKindResolution.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/CommonPlatformKindResolution.kt index 411662647c1..8d2e3849810 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/CommonPlatformKindResolution.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/CommonPlatformKindResolution.kt @@ -78,7 +78,9 @@ class CommonPlatformKindResolution : IdePlatformKindResolution { } } -class CommonKlibLibraryInfo(project: Project, library: Library, libraryRoot: String) : AbstractKlibLibraryInfo(project, library, libraryRoot) { +class CommonKlibLibraryInfo(project: Project, library: Library, libraryRoot: String) : + AbstractKlibLibraryInfo(project, library, libraryRoot) { + override val platform: TargetPlatform get() = CommonPlatforms.defaultCommonPlatform -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/AbstractKlibLibraryInfo.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/AbstractKlibLibraryInfo.kt index 0c269ee0c6b..b59d405563f 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/AbstractKlibLibraryInfo.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/AbstractKlibLibraryInfo.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.idea.util.IJLoggerAdapter import org.jetbrains.kotlin.konan.file.File import org.jetbrains.kotlin.library.ToolingSingleFileKlibResolveStrategy import org.jetbrains.kotlin.library.resolveSingleFileKlib +import org.jetbrains.kotlin.platform.TargetPlatform abstract class AbstractKlibLibraryInfo(project: Project, library: Library, val libraryRoot: String) : LibraryInfo(project, library) { @@ -23,7 +24,11 @@ abstract class AbstractKlibLibraryInfo(project: Project, library: Library, val l val compatibilityInfo by lazy { resolvedKotlinLibrary.getCompatibilityInfo() } - override fun getLibraryRoots() = listOf(libraryRoot) + final override fun getLibraryRoots() = listOf(libraryRoot) + + final override fun toString() = "${this::class.simpleName}(libraryName=${library.name}, libraryRoot=$libraryRoot)" + + abstract override val platform: TargetPlatform // must override companion object { private val LOG = IJLoggerAdapter.getInstance(AbstractKlibLibraryInfo::class.java) diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt index 96b5bc67bfb..d7b0a78d29a 100644 --- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt +++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt @@ -169,6 +169,4 @@ class NativeKlibLibraryInfo(project: Project, library: Library, libraryRoot: Str override val platform: TargetPlatform get() = KonanPlatforms.defaultKonanPlatform - - override fun toString() = "Native" + super.toString() }