MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] K2: calculate gradle sdk once on import

Browse Source 
#KTIJ-34393

GitOrigin-RevId: 6b79ab7d3a79ec4dfcc154f0081d27715675b9fd
This commit is contained in:
Vlad Koshkin
2025-06-24 12:19:57 +00:00
committed by intellij-monorepo-bot
parent 0a369840d6
commit bdd92d86cd
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/src/org/jetbrains/kotlin/gradle/scripting/k2/GradleScriptRefinedConfigurationProvider.kt
+5 -7
View File
@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.scripting.resolve.adjustByDefinition
import org.jetbrains.kotlin.scripting.resolve.refineScriptCompilationConfiguration
import org.jetbrains.plugins.gradle.util.GradleConstants
import java.io.File
import java.nio.file.Path
import java.util.concurrent.atomic.AtomicReference
import java.util.function.Predicate
import kotlin.script.experimental.api.*
@@ -44,17 +43,16 @@ class GradleScriptRefinedConfigurationProvider(
override fun get(virtualFile: VirtualFile): ScriptConfigurationWithSdk? = data.get()[virtualFile]
suspend fun processScripts(scriptsData: GradleScriptModelData, storageToUpdate: MutableEntityStorage? = null) {
val sdk = scriptsData.javaHome.resolveSdk()
val javaHomePath = sdk?.homePath?.let { File(it) }
val configurations = scriptsData.models.associate { gradleScript: GradleScriptModel ->
val sourceCode = VirtualFileScriptSource(gradleScript.virtualFile)
val definition = findScriptDefinition(project, sourceCode)
val sdk = scriptsData.javaHome.resolveSdk()
val javaHomePath = sdk?.homePath?.let { Path.of(it) }
val configuration = definition.compilationConfiguration.with {
javaHomePath?.let {
jvm.jdkHome(it.toFile())
if (javaHomePath != null) {
jvm.jdkHome(javaHomePath)
}
defaultImports(gradleScript.imports)
dependencies(JvmDependency(gradleScript.classPath.map { File(it) }))