From 47f47df5521a33eb0ba8f21688076c227411eb49 Mon Sep 17 00:00:00 2001 From: Nikita Katkov Date: Wed, 22 Oct 2025 19:53:27 +0200 Subject: [PATCH] [run dashboard & split mode] IJPL-211861 Avoid registering a popup action group on backend and frontend that leads to items duplication GitOrigin-RevId: 165d393e3582f39c45cea3400f17b59fe6165087 --- .../src/actions/RunDashboardFilterActionGroup.java | 3 ++- .../src/ServiceViewActionProvider.java | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/platform/execution.dashboard/src/actions/RunDashboardFilterActionGroup.java b/platform/execution.dashboard/src/actions/RunDashboardFilterActionGroup.java index ea6287a9b51e..e5f231e60541 100644 --- a/platform/execution.dashboard/src/actions/RunDashboardFilterActionGroup.java +++ b/platform/execution.dashboard/src/actions/RunDashboardFilterActionGroup.java @@ -12,6 +12,7 @@ import com.intellij.openapi.util.NlsActions; import com.intellij.platform.execution.dashboard.RunDashboardServiceViewContributor; import com.intellij.platform.execution.dashboard.splitApi.frontend.FrontendRunDashboardManager; import com.intellij.platform.execution.dashboard.splitApi.frontend.tree.RunDashboardStatusFilter; +import com.intellij.platform.execution.serviceView.ServiceViewActionProvider; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -19,7 +20,7 @@ import java.util.Set; import static com.intellij.execution.dashboard.RunDashboardRunConfigurationStatus.*; -final class RunDashboardFilterActionGroup extends DefaultActionGroup implements CheckedActionGroup, DumbAware { +final class RunDashboardFilterActionGroup extends ServiceViewActionProvider.DefaultFrontendServiceViewActionGroup implements CheckedActionGroup, DumbAware { @SuppressWarnings("unused") RunDashboardFilterActionGroup() { diff --git a/platform/execution.serviceView/src/ServiceViewActionProvider.java b/platform/execution.serviceView/src/ServiceViewActionProvider.java index e8b3d0ad6100..acffb9d5a3eb 100644 --- a/platform/execution.serviceView/src/ServiceViewActionProvider.java +++ b/platform/execution.serviceView/src/ServiceViewActionProvider.java @@ -11,6 +11,7 @@ import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.remoting.ActionRemoteBehaviorSpecification; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.NlsActions; import com.intellij.platform.execution.serviceView.ServiceModel.ServiceViewItem; import com.intellij.ui.ClientProperty; import com.intellij.ui.PopupHandler; @@ -270,7 +271,7 @@ public final class ServiceViewActionProvider { } }; - public static final class DefaultFrontendServiceViewActionGroup extends DefaultActionGroup + public static class DefaultFrontendServiceViewActionGroup extends DefaultActionGroup implements ActionRemoteBehaviorSpecification.Frontend { public DefaultFrontendServiceViewActionGroup() { @@ -283,6 +284,10 @@ public final class ServiceViewActionProvider { public DefaultFrontendServiceViewActionGroup(@NotNull List actions) { super(actions); } + + public DefaultFrontendServiceViewActionGroup(@Nullable @NlsActions.ActionText String name, boolean popup) { + super(name, popup); + } } public static final class ItemToolbarActionGroup extends ActionGroup implements ActionRemoteBehaviorSpecification.Frontend {