From 1d3b1ed0cbd5aa760765ede5a07fcc9893983742 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Wed, 17 Jul 2019 18:28:06 +0700 Subject: [PATCH] CIDR: Filter aux library order entries that do not represent K/N libraries Issue #KT-32726 Fixed --- .../kotlin/ide/konan/NativePlatformKindResolution.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 c9165e51256..496d0d369db 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 @@ -38,10 +38,11 @@ import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult class NativePlatformKindResolution : IdePlatformKindResolution { override fun createLibraryInfo(project: Project, library: Library): List { - return library.getFiles(OrderRootType.CLASSES) - .mapNotNull { file -> PathUtil.getLocalPath(file) } - .map { path -> File(path) } - .map { file -> NativeLibraryInfo(project, library, file) } + return library.getFiles(OrderRootType.CLASSES).mapNotNull { file -> + if (!isLibraryFileForPlatform(file)) return@createLibraryInfo emptyList() + val path = PathUtil.getLocalPath(file) ?: return@createLibraryInfo emptyList() + NativeLibraryInfo(project, library, File(path)) + } } override fun isLibraryFileForPlatform(virtualFile: VirtualFile): Boolean {