From 0d6c7f2b41e6a24b8c074df54ea460b310018650 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Thu, 7 May 2020 16:31:06 +0300 Subject: [PATCH] ScriptClassRootsCache, sdk: use toSystemIndependentName --- .../core/script/configuration/utils/ScriptClassRootsCache.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/ScriptClassRootsCache.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/ScriptClassRootsCache.kt index 3a83ac313de..bb822abfb65 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/ScriptClassRootsCache.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/ScriptClassRootsCache.kt @@ -12,6 +12,7 @@ import com.intellij.openapi.projectRoots.Sdk import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.roots.ProjectRootManager +import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.search.GlobalSearchScope @@ -102,7 +103,7 @@ class ScriptClassRootsCache( fun addSdk(javaHome: File?): Sdk? { if (javaHome == null) return defaultSdk - val canonicalPath = javaHome.canonicalPath + val canonicalPath = toSystemIndependentName(javaHome.canonicalPath) return sdks.getOrPut(canonicalPath) { getScriptSdkByJavaHome(javaHome) ?: defaultSdk }