diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleRunAnythingProvider.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleRunAnythingProvider.java index 31cfa3c41ae6..e6130fbc228f 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleRunAnythingProvider.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleRunAnythingProvider.java @@ -25,6 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.gradle.action.GradleExecuteTaskAction; import org.jetbrains.plugins.gradle.service.execution.cmd.GradleCommandLineOptionsProvider; +import org.jetbrains.plugins.gradle.service.project.GradleProjectResolverUtil; import org.jetbrains.plugins.gradle.settings.GradleProjectSettings; import org.jetbrains.plugins.gradle.settings.GradleSettings; import org.jetbrains.plugins.gradle.util.GradleConstants; @@ -225,15 +226,7 @@ public class GradleRunAnythingProvider extends RunAnythingProviderBase { MultiMap projectTasks = MultiMap.createOrderedSet(); for (DataNode moduleDataNode : getChildren(projectData.getExternalProjectStructure(), ProjectKeys.MODULE)) { - String gradlePath; - String moduleId = moduleDataNode.getData().getId(); - if (moduleId.charAt(0) != ':') { - int colonIndex = moduleId.indexOf(':'); - gradlePath = colonIndex > 0 ? moduleId.substring(colonIndex) : ":"; - } - else { - gradlePath = moduleId; - } + String gradlePath = GradleProjectResolverUtil.getGradlePath(moduleDataNode.getData()); for (DataNode node : getChildren(moduleDataNode, ProjectKeys.TASK)) { TaskData taskData = node.getData(); String taskName = taskData.getName(); diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java index 171ee5642327..f61a339e2891 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java @@ -302,6 +302,20 @@ public class GradleProjectResolverUtil { return join.isEmpty() ? ":" : ":" + join; } + @NotNull + public static String getGradlePath(@NotNull ModuleData moduleData) { + String gradlePath; + String moduleId = moduleData.getId(); + if (moduleId.charAt(0) != ':') { + int colonIndex = moduleId.indexOf(':'); + gradlePath = colonIndex > 0 ? moduleId.substring(colonIndex) : ":"; + } + else { + gradlePath = moduleId; + } + return gradlePath; + } + @NotNull public static DependencyScope getDependencyScope(@Nullable String scope) { return scope != null ? DependencyScope.valueOf(scope) : DependencyScope.COMPILE; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleExtensionsSettings.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleExtensionsSettings.java index 3253806c70c6..e0119b3d5b73 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleExtensionsSettings.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleExtensionsSettings.java @@ -75,16 +75,7 @@ public class GradleExtensionsSettings { DataNode parent = node.getParent(); if (parent == null) continue; if (!(parent.getData() instanceof ModuleData)) continue; - ModuleData moduleData = (ModuleData)parent.getData(); - String gradlePath; - String moduleId = moduleData.getId(); - if (moduleId.charAt(0) != ':') { - int colonIndex = moduleId.indexOf(':'); - gradlePath = colonIndex > 0 ? moduleId.substring(colonIndex) : ":"; - } - else { - gradlePath = moduleId; - } + String gradlePath = GradleProjectResolverUtil.getGradlePath((ModuleData)parent.getData()); extensionMap.put(gradlePath, node.getData()); }