From dff4d294cff124276e063beb5fe33c03e83023b7 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Tue, 4 Aug 2015 15:38:12 +0300 Subject: [PATCH] gradle: filter idea gradle plugin tasks using group --- .../project/BaseGradleProjectResolverExtension.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java index 8760b7ad3d06..3477484e7f6d 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java @@ -347,7 +347,7 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver if (externalProject != null) { for (ExternalTask task : externalProject.getTasks().values()) { String taskName = task.getName(); - if (taskName.trim().isEmpty() || isIdeaTask(taskName)) { + if (taskName.trim().isEmpty() || isIdeaTask(taskName, task.getGroup())) { continue; } TaskData taskData = new TaskData(GradleConstants.SYSTEM_ID, taskName, moduleConfigPath, task.getDescription()); @@ -362,7 +362,7 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver for (GradleTask task : gradleModule.getGradleProject().getTasks()) { String taskName = task.getName(); - if (taskName == null || taskName.trim().isEmpty() || isIdeaTask(taskName)) { + if (taskName == null || taskName.trim().isEmpty() || isIdeaTask(taskName, task.getGroup())) { continue; } TaskData taskData = new TaskData(GradleConstants.SYSTEM_ID, taskName, moduleConfigPath, task.getDescription()); @@ -832,8 +832,8 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver } } - private static boolean isIdeaTask(final String taskName) { - return taskName.toLowerCase(Locale.ENGLISH).contains("idea"); + private static boolean isIdeaTask(final String taskName, @Nullable String group) { + return (group == null || "ide".equalsIgnoreCase(group)) && taskName.toLowerCase(Locale.ENGLISH).contains("idea"); } private static void addCompileOutputPath(@NotNull Map compileOutputPaths,