From 33368590e426984eaa9040d620a57d78dc8c8c4a Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Tue, 3 Mar 2020 10:28:37 +0300 Subject: [PATCH] KotlinDslScriptsModelResolver: return back requireTaskRunning override It is required for collecting KotlinDslScriptsModels because we need to run `prepareKotlinBuildScriptModel` task before --- .../scripting/gradle/importing/KotlinDslScriptModelResolver.kt | 2 ++ .../gradle/importing/KotlinDslScriptModelResolver.kt.192 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt index 9d71838dff0..1d8c81d6472 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt @@ -15,6 +15,8 @@ import org.jetbrains.plugins.gradle.model.ClassSetImportModelProvider import org.jetbrains.plugins.gradle.model.ProjectImportModelProvider class KotlinDslScriptModelResolver : KotlinDslScriptModelResolverCommon() { + override fun requiresTaskRunning() = true + override fun getModelProvider() = KotlinDslScriptModelProvider() override fun getProjectsLoadedModelProvider(): ProjectImportModelProvider? { diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.192 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.192 index 7ed428f2dbd..c6471d684f1 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.192 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.192 @@ -14,6 +14,8 @@ import org.jetbrains.plugins.gradle.model.ProjectImportModelProvider import org.jetbrains.plugins.gradle.model.ClassSetBuildImportModelProvider class KotlinDslScriptModelResolver : KotlinDslScriptModelResolverCommon() { + override fun requiresTaskRunning() = true + override fun getModelProvider() = KotlinDslScriptModelProvider() override fun getProjectsLoadedModelProvider(): ProjectImportModelProvider? {