Gradle Project importing: move ModelBuilders and ModelProviders to kotlin-gradle-tooling

^KT-36673 Fixed
2020-04-28 19:28:59 +03:00
parent 6ca3a994d9
commit d716c47f17
14 changed files with 38 additions and 12 deletions
@@ -10,9 +10,6 @@ dependencies {
    compileOnly(project(":idea:idea-jvm"))
    compileOnly(project(":idea:idea-native"))
    compile(project(":idea:kotlin-gradle-tooling"))
-    Platform[193].orLower {
-        compile(project(":idea:idea-gradle-tooling-api"))
-    }

    compile(project(":compiler:frontend"))
    compile(project(":compiler:frontend.java"))
@@ -3,4 +3,4 @@
 # 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
+org.jetbrains.kotlin.gradle.KotlinDslScriptTaskModelBuilder
@@ -1,20 +0,0 @@
-/*
- * 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.tooling.model.kotlin.dsl.KotlinDslScriptModel
-import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel
-import java.io.File
-import java.io.PrintWriter
-import java.io.Serializable
-import java.io.StringWriter
-
-class BrokenKotlinDslScriptsModel(exception: Throwable) : KotlinDslScriptsModel, Serializable {
-    val message = exception.message
-    val stackTrace = StringWriter().also { exception.printStackTrace(PrintWriter(it)) }.toString()
-
-    override fun getScriptModels(): Map<File, KotlinDslScriptModel> = mapOf()
-}
@@ -1,41 +0,0 @@
-/*
- * Copyright 2010-2019 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.tooling.BuildController
-import org.gradle.tooling.model.Model
-import org.gradle.tooling.model.gradle.GradleBuild
-import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel
-import org.jetbrains.plugins.gradle.model.ProjectImportModelProvider
-
-class KotlinDslScriptModelProvider : ProjectImportModelProvider {
-    private val kotlinDslScriptModelClass: Class<*> = KotlinDslScriptsModel::class.java
-
-    override fun populateBuildModels(
-        controller: BuildController,
-        buildModel: GradleBuild,
-        consumer: ProjectImportModelProvider.BuildModelConsumer
-    ) {
-        buildModel.projects.forEach {
-            if (it.parent == null) {
-                try {
-                    val model = controller.findModel(it, kotlinDslScriptModelClass)
-                    if (model != null) {
-                        consumer.consumeProjectModel(it, model, kotlinDslScriptModelClass)
-                    }
-                } catch (e: Throwable) {
-                    consumer.consumeProjectModel(it, BrokenKotlinDslScriptsModel(e), kotlinDslScriptModelClass)
-                }
-            }
-        }
-    }
-
-    override fun populateProjectModels(
-        controller: BuildController,
-        projectModel: Model,
-        modelConsumer: ProjectImportModelProvider.ProjectModelConsumer
-    ) = Unit
-}
@@ -9,6 +9,8 @@ import com.intellij.openapi.externalSystem.model.DataNode
 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.gradle.KotlinDslScriptAdditionalTask
+import org.jetbrains.kotlin.gradle.KotlinDslScriptModelProvider
 import org.jetbrains.kotlin.idea.scripting.gradle.kotlinDslScriptsModelImportSupported
 import org.jetbrains.plugins.gradle.model.Build
 import org.jetbrains.plugins.gradle.model.ClassSetImportModelProvider
@@ -9,6 +9,8 @@ import com.intellij.openapi.externalSystem.model.DataNode
 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.gradle.KotlinDslScriptAdditionalTask
+import org.jetbrains.kotlin.gradle.KotlinDslScriptModelProvider
 import org.jetbrains.kotlin.idea.scripting.gradle.kotlinDslScriptsModelImportSupported
 import org.jetbrains.plugins.gradle.model.ProjectImportModelProvider
 import org.jetbrains.plugins.gradle.model.ClassSetBuildImportModelProvider
@@ -7,6 +7,8 @@ package org.jetbrains.kotlin.idea.scripting.gradle.importing

 import org.jetbrains.plugins.gradle.model.ClassSetImportModelProvider
 import org.jetbrains.plugins.gradle.model.ProjectImportModelProvider
+import org.jetbrains.kotlin.gradle.KotlinDslScriptAdditionalTask
+import org.jetbrains.kotlin.gradle.KotlinDslScriptModelProvider
 import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel
 import org.jetbrains.kotlin.idea.scripting.gradle.kotlinDslScriptsModelImportSupported
 import org.jetbrains.plugins.gradle.service.project.ModifiableGradleProjectModel
@@ -10,6 +10,7 @@ import com.intellij.openapi.externalSystem.util.Order
 import com.intellij.openapi.util.Pair
 import org.gradle.tooling.model.kotlin.dsl.KotlinDslModelsParameters.*
 import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel
+import org.jetbrains.kotlin.gradle.KotlinDslScriptAdditionalTask
 import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension

 internal val LOG = Logger.getInstance(KotlinDslScriptModelResolverCommon::class.java)
@@ -20,6 +21,10 @@ abstract class KotlinDslScriptModelResolverCommon : AbstractProjectResolverExten
        return setOf(KotlinDslScriptsModel::class.java)
    }

+    override fun getToolingExtensionsClasses(): Set<Class<out Any>> {
+        return setOf(KotlinDslScriptAdditionalTask::class.java)
+    }
+
    override fun getExtraJvmArgs(): List<Pair<String, String>> {
        return listOf(
            Pair(
@@ -1,37 +0,0 @@
-/*
- * 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.")
-    }
-}
@@ -13,6 +13,7 @@ import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.vfs.VfsUtil
 import org.gradle.tooling.model.kotlin.dsl.EditorReportSeverity
 import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel
+import org.jetbrains.kotlin.gradle.BrokenKotlinDslScriptsModel
 import org.jetbrains.kotlin.idea.KotlinIdeaGradleBundle
 import org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptInputsWatcher
 import org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptingSupportProvider