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

Fix: KLIB reading error on Windows

Browse Source 
Issue #KT-34909
This commit is contained in:
Dmitriy Dolovov
2019-11-14 16:16:07 +07:00
parent 77950c5410
commit 1b2091d536
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt
+2 -1
View File
@@ -14,6 +14,7 @@ import com.intellij.psi.SingleRootFileViewProvider
import com.intellij.psi.impl.PsiFileFactoryImpl import com.intellij.psi.impl.PsiFileFactoryImpl
import com.intellij.psi.stubs.PsiFileStub import com.intellij.psi.stubs.PsiFileStub
import com.intellij.testFramework.LightVirtualFile import com.intellij.testFramework.LightVirtualFile
import com.intellij.util.PathUtil
import org.jetbrains.kotlin.ide.konan.decompiler.KotlinNativeLoadingMetadataCache import org.jetbrains.kotlin.ide.konan.decompiler.KotlinNativeLoadingMetadataCache
import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.KotlinFileType
import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.KotlinLanguage
@@ -53,7 +54,7 @@ internal object CachingIdeKonanLibraryMetadataLoader : PackageAccessHandler {
if (library.isZipped) asJarFileSystemFile(library.libraryFile, file) else asLocalFile(file) if (library.isZipped) asJarFileSystemFile(library.libraryFile, file) else asLocalFile(file)
private fun asJarFileSystemFile(jarFile: KFile, localFile: KFile): VirtualFile { 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") return StandardFileSystems.jar().findFileByPath(fullPath) ?: error("File not found: $fullPath")
} }