From dcd67d79f45cebeb3681295d604e798456ca1d52 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Wed, 4 Dec 2019 15:05:41 +0300 Subject: [PATCH] gradle.kts: script models should be imported in ProjectData key, not in GradleSourceSetData Or it will be fail if there is no source sets (see org.jetbrains.kotlin.idea.codeInsight.gradle.GradleKtsImportTest.testEmpty for reproduction) --- .../configuration/KotlinGradleBuildScriptsDataService.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleBuildScriptsDataService.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleBuildScriptsDataService.kt index c9293517c47..a273eb0be6b 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleBuildScriptsDataService.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleBuildScriptsDataService.kt @@ -40,18 +40,18 @@ import kotlin.script.experimental.jvm.JvmDependency import kotlin.script.experimental.jvm.jdkHome import kotlin.script.experimental.jvm.jvm -class KotlinGradleBuildScriptsDataService : AbstractProjectDataService() { - override fun getTargetDataKey(): Key = GradleSourceSetData.KEY +class KotlinGradleBuildScriptsDataService : AbstractProjectDataService() { + override fun getTargetDataKey(): Key = ProjectKeys.PROJECT override fun onSuccessImport( - imported: MutableCollection>, + imported: MutableCollection>, projectData: ProjectData?, project: Project, modelsProvider: IdeModelsProvider ) { super.onSuccessImport(imported, projectData, project, modelsProvider) - val projectDataNode = imported.firstNotNullResult { ExternalSystemApiUtil.findParent(it, ProjectKeys.PROJECT) } ?: return + val projectDataNode = imported.singleOrNull() ?: return val buildScripts = projectDataNode.gradleKotlinBuildScripts ?: return val gradleSettings = ExternalSystemApiUtil.getSettings(project, GradleConstants.SYSTEM_ID)