From a4daf9f1ff683f45a13769e62d58ee6b0c5e2142 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 7 Sep 2018 22:12:27 +0300 Subject: [PATCH] More precise libraryMap in createResolvedModuleDescriptors --- .../src/org/jetbrains/konan/KonanPluginUtil.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/idea/idea-native/src/org/jetbrains/konan/KonanPluginUtil.kt b/idea/idea-native/src/org/jetbrains/konan/KonanPluginUtil.kt index d70386cfc6d..29b19016556 100644 --- a/idea/idea-native/src/org/jetbrains/konan/KonanPluginUtil.kt +++ b/idea/idea-native/src/org/jetbrains/konan/KonanPluginUtil.kt @@ -26,6 +26,7 @@ import org.jetbrains.kotlin.konan.library.libraryResolver import org.jetbrains.kotlin.konan.utils.KonanFactories.DefaultResolvedDescriptorsFactory import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes +import org.jetbrains.kotlin.resolve.konan.platform.KonanPlatform import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService import org.jetbrains.kotlin.serialization.konan.KonanResolvedModuleDescriptors import org.jetbrains.kotlin.storage.StorageManager @@ -69,8 +70,12 @@ fun ModuleInfo.createResolvedModuleDescriptors( // This is to preserve "capabilities" from the original IntelliJ LibraryInfo: val libraryMap = this.dependencies().filterIsInstance().flatMap { dependency -> - dependency.getLibraryRoots().map { file -> - file to dependency + if (dependency.platform == KonanPlatform) { + dependency.getLibraryRoots().map { file -> + file to dependency + } + } else { + emptyList() } }.toMap()