From 5e13f0a3724ca96f7862d7d2919746264c83ef2e Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Thu, 9 Mar 2017 15:59:16 +0300
Subject: [PATCH] IDEA-169103 Composite build configuration is not saved

---
 .../service/project/GradleProjectResolver.java       | 12 +++++++-----
 .../project/data/CompositeBuildDataService.java      |  4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
index f349d69ba763..548606c88765 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
@@ -309,7 +309,7 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
       throw new IllegalStateException("No modules found for the target project: " + ideaProject);
     }
 
-    Collection<IdeaModule> includedModules = exposeCompositeBuild(allModels, projectDataNode);
+    Collection<IdeaModule> includedModules = exposeCompositeBuild(allModels, resolverCtx, projectDataNode);
     final Map<String /* module id */, Pair<DataNode<ModuleData>, IdeaModule>> moduleMap = ContainerUtilRt.newHashMap();
     final Map<String /* module id */, Pair<DataNode<GradleSourceSetData>, ExternalSourceSet>> sourceSetsMap = ContainerUtil.newHashMap();
     projectDataNode.putUserData(RESOLVED_SOURCE_SETS, sourceSetsMap);
@@ -421,8 +421,12 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
 
   @NotNull
   private static Collection<IdeaModule> exposeCompositeBuild(ProjectImportAction.AllModels allModels,
+                                                             DefaultProjectResolverContext resolverCtx,
                                                              DataNode<ProjectData> projectDataNode) {
-    CompositeBuildData compositeBuildData = null;
+    if(resolverCtx.getSettings() != null && !resolverCtx.getSettings().getExecutionWorkspace().getBuildParticipants().isEmpty()) {
+      return Collections.emptyList();
+    }
+    CompositeBuildData compositeBuildData;
     List<IdeaModule> gradleIncludedModules = new SmartList<>();
     List<IdeaProject> includedBuilds = allModels.getIncludedBuilds();
     if (!includedBuilds.isEmpty()) {
@@ -432,9 +436,7 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
         if (!project.getModules().isEmpty()) {
           String rootProjectName = project.getName();
           BuildParticipant buildParticipant = new BuildParticipant();
-          for (IdeaModule ideaModule : project.getModules()) {
-            gradleIncludedModules.add(ideaModule);
-          }
+          gradleIncludedModules.addAll(project.getModules());
           GradleProject gradleProject = project.getModules().getAt(0).getGradleProject();
           String projectPath = null;
           do {
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/CompositeBuildDataService.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/CompositeBuildDataService.java
index 005c2a23da8f..ed86f5eab64b 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/CompositeBuildDataService.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/CompositeBuildDataService.java
@@ -54,7 +54,9 @@ public class CompositeBuildDataService extends AbstractProjectDataService<Compos
       if (projectData != null) {
         GradleProjectSettings projectSettings =
           GradleSettings.getInstance(project).getLinkedProjectSettings(projectData.getLinkedExternalProjectPath());
-        if (projectSettings != null) {
+        if (projectSettings != null &&
+            projectSettings.getCompositeBuild() != null &&
+            projectSettings.getCompositeBuild().getCompositeDefinitionSource() == CompositeDefinitionSource.SCRIPT) {
           projectSettings.setCompositeBuild(null);
         }
       }