MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] K2: in scripts use projectSdk if there is any

Browse Source 
GitOrigin-RevId: 4e332fa878ed5a85abd0f679ab6bf625b11e1848
This commit is contained in:
Vlad Koshkin
2024-07-12 13:43:40 +02:00
committed by intellij-monorepo-bot
parent 4ee04a3e95
commit 73d0177c8b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/K2ScriptDependenciesProvider.kt
View File

@@ -137,7 +137,13 @@ class K2ScriptDependenciesProvider(project: Project) : ScriptDependenciesProvide
classes.addAll(toVfsRoots(configurationWrapper.dependenciesClassPath))
sources.addAll(toVfsRoots(configurationWrapper.dependenciesSources))
configurationWrapper.javaHome?.toPath()?.let {
sdks[it] = ExternalSystemJdkUtil.lookupJdkByPath(it.pathString)
val projectSdk = ProjectRootManager.getInstance(project).projectSdk
if (projectSdk != null && projectSdk.homePath == javaHome) {
sdks[it] = projectSdk
} else {
sdks[it] = ExternalSystemJdkUtil.lookupJdkByPath(it.pathString)
}
}
counter++