From 73d0177c8bfa3a03fd2deaf475293772471b0afe Mon Sep 17 00:00:00 2001 From: Vlad Koshkin Date: Fri, 12 Jul 2024 13:43:40 +0200 Subject: [PATCH] [kotlin] K2: in scripts use projectSdk if there is any GitOrigin-RevId: 4e332fa878ed5a85abd0f679ab6bf625b11e1848 --- .../idea/core/script/K2ScriptDependenciesProvider.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/K2ScriptDependenciesProvider.kt b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/K2ScriptDependenciesProvider.kt index c3d987c13d9d..4a8d7fd79879 100644 --- a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/K2ScriptDependenciesProvider.kt +++ b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/K2ScriptDependenciesProvider.kt @@ -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++