KotlinDslScriptsModel: do not add prepare task for each gradle task invocation

^KT-36090 Fixed
2020-02-05 12:52:16 +03:00
parent e40dc37be8
commit ed6f13cf56
7 changed files with 60 additions and 11 deletions
@@ -0,0 +1,6 @@
+#
+# Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+# Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+#
+
+org.jetbrains.kotlin.idea.scripting.gradle.importing.KotlinDslScriptTaskModelBuilder
@@ -7,15 +7,22 @@ package org.jetbrains.kotlin.idea.scripting.gradle.importing

 import com.intellij.openapi.externalSystem.model.DataNode
 import com.intellij.openapi.externalSystem.model.project.ProjectData
-import org.gradle.tooling.model.GradleProject
 import org.gradle.tooling.model.idea.IdeaProject
 import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel
 import org.jetbrains.kotlin.idea.scripting.gradle.kotlinDslScriptsModelImportSupported
 import org.jetbrains.plugins.gradle.model.Build
+import org.jetbrains.plugins.gradle.model.ClassSetImportModelProvider
+import org.jetbrains.plugins.gradle.model.ProjectImportModelProvider

 class KotlinDslScriptModelResolver : KotlinDslScriptModelResolverCommon() {
    override fun getModelProvider() = KotlinDslScriptModelProvider()
-    override fun requiresTaskRunning() = true
+
+    override fun getProjectsLoadedModelProvider(): ProjectImportModelProvider? {
+        return ClassSetImportModelProvider(
+            emptySet(),
+            setOf(KotlinDslScriptAdditionalTask::class.java)
+        )
+    }

    override fun populateProjectExtraModels(gradleProject: IdeaProject, ideProject: DataNode<ProjectData>) {
        super.populateProjectExtraModels(gradleProject, ideProject)
@@ -10,10 +10,17 @@ import com.intellij.openapi.externalSystem.model.project.ProjectData
 import org.gradle.tooling.model.idea.IdeaProject
 import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel
 import org.jetbrains.kotlin.idea.scripting.gradle.kotlinDslScriptsModelImportSupported
+import org.jetbrains.plugins.gradle.model.ProjectImportModelProvider
+import org.jetbrains.plugins.gradle.model.ClassSetBuildImportModelProvider

 class KotlinDslScriptModelResolver : KotlinDslScriptModelResolverCommon() {
    override fun getModelProvider() = KotlinDslScriptModelProvider()
-    override fun requiresTaskRunning() = true
+
+    override fun getProjectsLoadedModelProvider(): ProjectImportModelProvider? {
+        return ClassSetBuildImportModelProvider(
+            setOf(KotlinDslScriptAdditionalTask::class.java)
+        )
+    }

    override fun populateProjectExtraModels(gradleProject: IdeaProject, ideProject: DataNode<ProjectData>) {
        super.populateProjectExtraModels(gradleProject, ideProject)
@@ -9,11 +9,9 @@ import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.externalSystem.model.DataNode
 import com.intellij.openapi.externalSystem.model.project.ProjectData
 import com.intellij.openapi.util.Pair
-import com.intellij.util.Consumer
 import org.gradle.tooling.model.kotlin.dsl.EditorReportSeverity
 import org.gradle.tooling.model.kotlin.dsl.KotlinDslModelsParameters.*
 import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel
-import org.jetbrains.kotlin.idea.scripting.gradle.minimal_gradle_version_supported
 import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension

 internal val LOG = Logger.getInstance(KotlinDslScriptModelResolverCommon::class.java)
@@ -32,12 +30,6 @@ abstract class KotlinDslScriptModelResolverCommon : AbstractProjectResolverExten
        )
    }

-    override fun enhanceTaskProcessing(taskNames: MutableList<String>, jvmParametersSetup: String?, initScriptConsumer: Consumer<String>) {
-        initScriptConsumer.consume(
-            "if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version(\"$minimal_gradle_version_supported\")) startParameter.taskNames += [\"${PREPARATION_TASK_NAME}\"]"
-        )
-    }
-
    override fun getExtraCommandLineArgs(): List<String> {
        return listOf("-P$CORRELATION_ID_GRADLE_PROPERTY_NAME=${System.nanoTime()}")
    }
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+package org.jetbrains.kotlin.idea.scripting.gradle.importing
+
+import org.gradle.api.Project
+import org.gradle.tooling.model.kotlin.dsl.KotlinDslModelsParameters.PREPARATION_TASK_NAME
+import org.jetbrains.kotlin.idea.scripting.gradle.kotlinDslScriptsModelImportSupported
+import org.jetbrains.plugins.gradle.tooling.AbstractModelBuilderService
+import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder
+import org.jetbrains.plugins.gradle.tooling.ModelBuilderContext
+
+interface KotlinDslScriptAdditionalTask
+
+class KotlinDslScriptTaskModelBuilder : AbstractModelBuilderService() {
+    override fun canBuild(modelName: String): Boolean {
+        return KotlinDslScriptAdditionalTask::class.java.name == modelName
+    }
+
+    override fun buildAll(modelName: String, project: Project, context: ModelBuilderContext): Any? {
+        if (kotlinDslScriptsModelImportSupported(project.gradle.gradleVersion)) {
+            val startParameter = project.gradle.startParameter
+
+            val tasks = HashSet(startParameter.taskNames)
+            tasks.add(PREPARATION_TASK_NAME)
+            startParameter.setTaskNames(tasks)
+        }
+        return null
+    }
+
+    override fun getErrorMessageBuilder(project: Project, e: Exception): ErrorMessageBuilder {
+        return ErrorMessageBuilder.create(
+            project, e, "Kotlin DSL script model errors"
+        ).withDescription("Unable to set $PREPARATION_TASK_NAME sync task.")
+    }
+}