From 8ad947dd594491cda865cc5bd1543d4565491d57 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Fri, 8 Apr 2016 18:18:04 +0300 Subject: [PATCH] IDEA-154371 New Project / Module wizard: Gradle: switching Off all "Additional Libraries and Frameworks" creates module content root in unrelated location --- .../gradle/service/project/GradleProjectResolver.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 5600c1351013..9cc45ae1f245 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 @@ -628,7 +628,10 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver moduleNode) { final File buildDir = externalProject.getBuildDir(); final MultiMap sourceSetRoots = MultiMap.create(); - for (DataNode contentRootNode : ExternalSystemApiUtil.findAll(moduleNode, ProjectKeys.CONTENT_ROOT)) { + Collection> contentRootNodes = ExternalSystemApiUtil.findAll(moduleNode, ProjectKeys.CONTENT_ROOT); + if(contentRootNodes.size() <= 1) return; + + for (DataNode contentRootNode : contentRootNodes) { File root = new File(contentRootNode.getData().getRootPath()); if (FileUtil.isAncestor(buildDir, root, true)) continue;