From 5954fe528b378183b1c02334387088f8767846f4 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Tue, 7 Jul 2020 15:12:10 +0300 Subject: [PATCH] gradle.kts: do not return ErrorScriptDefinition into GradleBuildRootManager In this case script definition is saved into script info, but only real script definitions should be cached In case of null script configurations will be reloaded into cache when scriptdefinitions will be ready ^KT-39910 Fixed --- .../idea/scripting/gradle/GradleScriptDefinitionsProvider.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptDefinitionsProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptDefinitionsProvider.kt index 6235683fbe8..8dc5732214a 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptDefinitionsProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptDefinitionsProvider.kt @@ -64,6 +64,10 @@ class GradleScriptDefinitionsContributor(private val project: Project) : ScriptD } val root = LightGradleBuildRoot(workingDir, gradleHome, javaHome) + with(contributor) { + if (root.isError()) return null + } + val definitions = contributor.definitionsByRoots[root] if (definitions == null) { scriptingInfoLog(