diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProvider.kt.as40 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProvider.kt.as40 deleted file mode 100644 index 022c44fb86a..00000000000 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProvider.kt.as40 +++ /dev/null @@ -1,33 +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, - gradleBuild: GradleBuild, - consumer: ProjectImportModelProvider.BuildModelConsumer - ) { - val model = controller.findModel(gradleBuild.rootProject, kotlinDslScriptModelClass) - if (model != null) { - consumer.consume(gradleBuild, model, kotlinDslScriptModelClass) - } - } - - override fun populateProjectModels( - controller: BuildController, - model: Model, - modelConsumer: ProjectImportModelProvider.ProjectModelConsumer - ) = Unit -} \ No newline at end of file diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.as40 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.as40 deleted file mode 100644 index bf3e89c476a..00000000000 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.as40 +++ /dev/null @@ -1,44 +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 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 - -class KotlinDslScriptModelResolver : KotlinDslScriptModelResolverCommon() { - override fun getModelProvider() = KotlinDslScriptModelProvider() - override fun requiresTaskRunning() = true - - override fun populateProjectExtraModels(gradleProject: IdeaProject, ideProject: DataNode) { - super.populateProjectExtraModels(gradleProject, ideProject) - - if (kotlinDslScriptsModelImportSupported(resolverCtx.projectGradleVersion)) { - populateBuildModels(resolverCtx.models.mainBuild, ideProject) - - resolverCtx.models.includedBuilds.forEach { includedRoot -> - populateBuildModels(includedRoot, ideProject) - } - } - } - - private fun populateBuildModels( - root: Build, - ideProject: DataNode - ) { - root.projects.forEach { - if ((it as? GradleProject)?.parent == null) { - resolverCtx.models.getModel(it, KotlinDslScriptsModel::class.java)?.let { model -> - ideProject.KOTLIN_DSL_SCRIPT_MODELS.addAll(model.toListOfScriptModels()) - } - } - } - } -} \ No newline at end of file