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

Simplified IDE module grouping to support source sets

Browse Source
This commit is contained in:
Fedor Korotkov
2018-11-08 14:25:37 +03:00
committed by Vladislav.Soroka
parent 9640755768
commit 93b30010bc
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java
+1 -3
View File
@@ -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
plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/GradleSourceSetData.java
+8
View File
@@ -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(), ".");
}
}