azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CIDR: Filter aux library order entries that do not represent K/N libraries

Browse Source 
Issue #KT-32726 Fixed
This commit is contained in:
Dmitriy Dolovov
2019-07-17 18:28:06 +07:00
parent 10b79816ab
commit 1d3b1ed0cb
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt
+5 -4
View File
@@ -38,10 +38,11 @@ import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
class NativePlatformKindResolution : IdePlatformKindResolution { class NativePlatformKindResolution : IdePlatformKindResolution {
override fun createLibraryInfo(project: Project, library: Library): List<LibraryInfo> { override fun createLibraryInfo(project: Project, library: Library): List<LibraryInfo> {
return library.getFiles(OrderRootType.CLASSES) return library.getFiles(OrderRootType.CLASSES).mapNotNull { file ->
.mapNotNull { file -> PathUtil.getLocalPath(file) } if (!isLibraryFileForPlatform(file)) return@createLibraryInfo emptyList()
.map { path -> File(path) } val path = PathUtil.getLocalPath(file) ?: return@createLibraryInfo emptyList()
.map { file -> NativeLibraryInfo(project, library, file) } NativeLibraryInfo(project, library, File(path))
}
} }
override fun isLibraryFileForPlatform(virtualFile: VirtualFile): Boolean { override fun isLibraryFileForPlatform(virtualFile: VirtualFile): Boolean {