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

ScriptClassRootsCache, sdk: use toSystemIndependentName

Browse Source
This commit is contained in:
Sergey Rostov
2020-05-07 16:31:06 +03:00
parent eda95af999
commit cfe6fee1ca
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/ScriptClassRootsCache.kt
+2 -1
View File
@@ -12,6 +12,7 @@ import com.intellij.openapi.projectRoots.Sdk
import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.ModuleRootManager
import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.roots.OrderRootType
import com.intellij.openapi.roots.ProjectRootManager 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.VfsUtil
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.GlobalSearchScope
@@ -102,7 +103,7 @@ class ScriptClassRootsCache(
fun addSdk(javaHome: File?): Sdk? { fun addSdk(javaHome: File?): Sdk? {
if (javaHome == null) return defaultSdk if (javaHome == null) return defaultSdk
val canonicalPath = javaHome.canonicalPath val canonicalPath = toSystemIndependentName(javaHome.canonicalPath)
return sdks.getOrPut(canonicalPath) { return sdks.getOrPut(canonicalPath) {
getScriptSdkByJavaHome(javaHome) ?: defaultSdk getScriptSdkByJavaHome(javaHome) ?: defaultSdk
} }