From 1b2091d536ff7bfc74e60b3598f15643e822400b Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 14 Nov 2019 16:16:07 +0700 Subject: [PATCH] Fix: KLIB reading error on Windows Issue #KT-34909 --- .../org/jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt index f1f012faf1a..6a6cc477f98 100644 --- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt +++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt @@ -14,6 +14,7 @@ import com.intellij.psi.SingleRootFileViewProvider import com.intellij.psi.impl.PsiFileFactoryImpl import com.intellij.psi.stubs.PsiFileStub import com.intellij.testFramework.LightVirtualFile +import com.intellij.util.PathUtil import org.jetbrains.kotlin.ide.konan.decompiler.KotlinNativeLoadingMetadataCache import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.KotlinLanguage @@ -53,7 +54,7 @@ internal object CachingIdeKonanLibraryMetadataLoader : PackageAccessHandler { if (library.isZipped) asJarFileSystemFile(library.libraryFile, file) else asLocalFile(file) private fun asJarFileSystemFile(jarFile: KFile, localFile: KFile): VirtualFile { - val fullPath = jarFile.absolutePath + "!" + localFile.absolutePath + val fullPath = jarFile.absolutePath + "!" + PathUtil.toSystemIndependentName(localFile.path) return StandardFileSystems.jar().findFileByPath(fullPath) ?: error("File not found: $fullPath") }