From 93b30010bc762196ea3bbf5cf6bd2ca05d2b6e23 Mon Sep 17 00:00:00 2001 From: Fedor Korotkov Date: Wed, 7 Nov 2018 14:31:17 -0500 Subject: [PATCH] Simplified IDE module grouping to support source sets --- .../openapi/externalSystem/model/project/ModuleData.java | 4 +--- .../plugins/gradle/model/data/GradleSourceSetData.java | 8 ++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java index 195759d76574..d8a31e22c1a1 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java +++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java @@ -226,9 +226,7 @@ public class ModuleData extends AbstractNamedData implements Named, ExternalConf @Nullable public String getIdeGrouping() { - String parentGrouping = getIdeParentGrouping(); - if (parentGrouping == null) return StringUtil.nullize(getInternalName()); - return StringUtil.join(parentGrouping, ".", getExternalName()); + return StringUtil.nullize(getInternalName()); } @Nullable diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/GradleSourceSetData.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/GradleSourceSetData.java index 5da88736e8e5..b11c7d1ca901 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/GradleSourceSetData.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/GradleSourceSetData.java @@ -18,7 +18,9 @@ package org.jetbrains.plugins.gradle.model.data; import com.intellij.openapi.externalSystem.model.Key; import com.intellij.openapi.externalSystem.model.ProjectKeys; import com.intellij.openapi.externalSystem.model.project.ModuleData; +import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.gradle.service.project.GradleProjectResolverUtil; import org.jetbrains.plugins.gradle.util.GradleConstants; @@ -39,4 +41,10 @@ public class GradleSourceSetData extends ModuleData { externalName, internalName, moduleFileDirectoryPath, externalConfigPath); } + + @Override + @Nullable + public String getIdeParentGrouping() { + return StringUtil.substringBeforeLast(getInternalName(), "."); + } }