MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[gradle] use explicit module grouping with per-project import IDEA-202466

Browse Source
This commit is contained in:
Nikita Skvortsov
2018-12-06 13:03:04 +03:00
parent b3a2109ade
commit a67048bbc2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
+6 -6
View File
@@ -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();