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] prepend a module name resolved for a build included into buildSrc with the build name IDEA-257835

Browse Source 
GitOrigin-RevId: 3d8cefc86239f6bbab1b298abe4c9330a14d53c1
This commit is contained in:
Vladislav.Soroka
2020-12-18 12:42:29 +00:00
committed by intellij-monorepo-bot
parent f99a286b5e
commit 47881c4a1e
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/java/testSources/importing/GradleBuildSrcImportingTest.kt
+2
View File
@@ -184,6 +184,7 @@ class GradleBuildSrcImportingTest : GradleImportingTestCase() {
includeBuild('build1')
includeBuild('build2')
""".trimIndent())
createProjectSubFile("buildSrc/settings.gradle")
createProjectSubFile("build1/settings.gradle", "include('app')")
@@ -192,6 +193,7 @@ class GradleBuildSrcImportingTest : GradleImportingTestCase() {
importProject("")
assertModules("project",
"project.buildSrc", "project.buildSrc.main", "project.buildSrc.test",
"build1", "build1.app",
"build2", "build2.app",
"build2.buildSrc", "build2.buildSrc.main", "build2.buildSrc.test")
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java
+10 -3
View File
@@ -191,7 +191,11 @@ public final class GradleProjectResolverUtil {
String compositePrefix = "";
boolean isRootPath = StringUtil.isEmpty(gradlePath) || ":".equals(gradlePath);
if (!StringUtil.isEmpty(resolverCtx.getBuildSrcGroup())) {
compositePrefix = resolverCtx.getBuildSrcGroup() + (isRootPath ? ":" : ":buildSrc");
if (!isRootPath && build != resolverCtx.getModels().getMainBuild()) {
compositePrefix = build.getName();
} else {
compositePrefix = resolverCtx.getBuildSrcGroup() + (isRootPath ? ":" : ":buildSrc");
}
}
else if (!isRootPath && build != resolverCtx.getModels().getMainBuild()) {
compositePrefix = build.getName();
@@ -199,7 +203,6 @@ public final class GradleProjectResolverUtil {
return compositePrefix + getModuleId(gradlePath, project.getName());
}
@NotNull
public static String getModuleId(@NotNull ProjectResolverContext resolverCtx, @NotNull IdeaModule gradleModule) {
GradleProject gradleProject = gradleModule.getGradleProject();
@@ -208,7 +211,11 @@ public final class GradleProjectResolverUtil {
IdeaProject ideaProject = gradleModule.getProject();
boolean isRootPath = StringUtil.isEmpty(gradlePath) || ":".equals(gradlePath);
if (!StringUtil.isEmpty(resolverCtx.getBuildSrcGroup())) {
compositePrefix = resolverCtx.getBuildSrcGroup() + (isRootPath ? ":" : ":buildSrc");
if (!isRootPath && ideaProject != resolverCtx.getModels().getModel(IdeaProject.class)) {
compositePrefix = ideaProject.getName();
} else {
compositePrefix = resolverCtx.getBuildSrcGroup() + (isRootPath ? ":" : ":buildSrc");
}
}
else if (!isRootPath && ideaProject != resolverCtx.getModels().getModel(IdeaProject.class)) {
compositePrefix = ideaProject.getName();