From 0b3b83f7575ee6f47c141dcad5a66a43a02bb4ea Mon Sep 17 00:00:00 2001 From: Semyon Kolton Date: Tue, 11 Oct 2022 13:58:11 +0200 Subject: [PATCH] CPP-30047 Don't show execution target name in run configuration selector IJ-CR-95900 GitOrigin-RevId: 0897302091988b5e8a4d5f4b86fb4c917a8dd7ea --- .../actions/RunConfigurationsComboBoxAction.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/platform/execution-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java b/platform/execution-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java index 74c32166c9c8..3086aba2215e 100644 --- a/platform/execution-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java +++ b/platform/execution-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java @@ -116,11 +116,14 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D presentation.putClientProperty(BUTTON_MODE, null); if (project != null && target != null && settings != null) { String name = Executor.shortenNameIfNeeded(settings.getName()); - if (target != DefaultExecutionTarget.INSTANCE && !target.isExternallyManaged()) { - name += " | " + target.getDisplayName(); - } else { - if (!ExecutionTargetManager.canRun(settings.getConfiguration(), target)) { - name += " | " + ExecutionBundle.message("run.configurations.combo.action.nothing.to.run.on"); + if (!ExperimentalUI.isNewUI()) { // there's a separate combo-box for execution targets in new UI + if (target != DefaultExecutionTarget.INSTANCE && !target.isExternallyManaged()) { + name += " | " + target.getDisplayName(); + } + else { + if (!ExecutionTargetManager.canRun(settings.getConfiguration(), target)) { + name += " | " + ExecutionBundle.message("run.configurations.combo.action.nothing.to.run.on"); + } } } presentation.setText(name, false); @@ -225,7 +228,7 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D if (!ExperimentalUI.isNewUI()) { - // no need for targets list in `All configuration` in new UI, since there is a separate combobox for them + // no need for targets list in `All configurations` in new UI, since there is a separate combobox for them addTargetGroup(project, allActionsGroup); }