From 954c1d853d4956eba1311bf62d9cbfef6c56084f Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 15 Feb 2017 22:47:33 +0100 Subject: [PATCH] Correctly locate build.gradle for modules created from source sets (cherry picked from commit ecce92d) --- .../idea/configuration/KotlinWithGradleConfigurator.kt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.kt index ad41cba4acf..d97f88864ff 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.kt +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.kt @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.idea.configuration import com.intellij.codeInsight.CodeInsightUtilCore import com.intellij.ide.actions.OpenFileAction +import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleUtil import com.intellij.openapi.project.Project @@ -404,6 +405,15 @@ abstract class KotlinWithGradleConfigurator : KotlinProjectConfigurator { return buildGradleFile.path } } + + val externalProjectPath = ExternalSystemApiUtil.getExternalProjectPath(module) + if (externalProjectPath != null) { + buildGradleFile = File(externalProjectPath + "/" + GradleConstants.DEFAULT_SCRIPT_NAME) + if (buildGradleFile.exists()) { + return buildGradleFile.path + } + } + return null }