From a67048bbc2fbb7d27d635758f80ece5380ffd3eb Mon Sep 17 00:00:00 2001 From: Nikita Skvortsov Date: Wed, 5 Dec 2018 17:35:15 +0300 Subject: [PATCH] [gradle] use explicit module grouping with per-project import IDEA-202466 --- .../project/BaseGradleProjectResolverExtension.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java index bbeb8300faf5..6c2fd5fbfbd6 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java @@ -142,14 +142,14 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver final String mainModuleFileDirectoryPath = mainModuleData.getModuleFileDirectoryPath(); final String jdkName = getJdkName(gradleModule); + String[] moduleGroup = null; + if (!resolverCtx.isUseQualifiedModuleNames()) { + moduleGroup = getIdeModuleGroup(mainModuleData.getInternalName(), gradleModule); + mainModuleData.setIdeModuleGroup(moduleGroup); + } + ExternalProject externalProject = resolverCtx.getExtraProject(gradleModule, ExternalProject.class); if (resolverCtx.isResolveModulePerSourceSet() && externalProject != null) { - String[] moduleGroup = null; - if (!resolverCtx.isUseQualifiedModuleNames()) { - moduleGroup = getIdeModuleGroup(mainModuleData.getInternalName(), gradleModule); - mainModuleData.setIdeModuleGroup(moduleGroup); - } - for (ExternalSourceSet sourceSet : externalProject.getSourceSets().values()) { final String moduleId = getModuleId(resolverCtx, gradleModule, sourceSet); final String moduleExternalName = gradleModule.getName() + ":" + sourceSet.getName();