From f7c2d3b4b0c33eeb5350b9a86091bc504d5a8dcd Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Tue, 14 Feb 2017 21:36:11 +0300 Subject: [PATCH] Use children of 'Choose run configuration' popup and Run action group in the same way + adjust run Choose run configuration popup title --- .../actions/BaseRunConfigurationAction.java | 13 +++++++++---- .../src/messages/ExecutionBundle.properties | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/actions/BaseRunConfigurationAction.java b/platform/lang-impl/src/com/intellij/execution/actions/BaseRunConfigurationAction.java index 121515c68f71..ebba0dbe0364 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/BaseRunConfigurationAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/BaseRunConfigurationAction.java @@ -70,9 +70,7 @@ public abstract class BaseRunConfigurationAction extends ActionGroup { for (final ConfigurationFromContext fromContext : producers) { final ConfigurationType configurationType = fromContext.getConfigurationType(); final RunConfiguration configuration = fromContext.getConfiguration(); - final String actionName = configuration instanceof LocatableConfiguration - ? StringUtil.unquoteString(suggestRunActionName((LocatableConfiguration)configuration)) - : configurationType.getDisplayName(); + final String actionName = childActionName(configurationType, configuration); final AnAction anAction = new AnAction(actionName, configurationType.getDisplayName(), configuration.getIcon()) { @Override public void actionPerformed(AnActionEvent e) { @@ -140,7 +138,7 @@ public abstract class BaseRunConfigurationAction extends ActionGroup { @Override @NotNull public String getTextFor(final ConfigurationFromContext producer) { - return StringUtil.notNullize(producer.getConfiguration().getName(), producer.getConfigurationType().getDisplayName()); + return childActionName(producer.getConfigurationType(), producer.getConfiguration()); } @Override @@ -220,6 +218,13 @@ public abstract class BaseRunConfigurationAction extends ActionGroup { return ProgramRunnerUtil.shortenName(configuration.getName(), 0); } + @NotNull + private static String childActionName(ConfigurationType configurationType, RunConfiguration configuration) { + return configuration instanceof LocatableConfiguration + ? StringUtil.unquoteString(suggestRunActionName((LocatableConfiguration)configuration)) + : configurationType.getDisplayName(); + } + protected abstract void updatePresentation(Presentation presentation, @NotNull String actionText, ConfigurationContext context); } diff --git a/platform/platform-resources-en/src/messages/ExecutionBundle.properties b/platform/platform-resources-en/src/messages/ExecutionBundle.properties index 7cfeb2274f00..6e0c80d82a16 100644 --- a/platform/platform-resources-en/src/messages/ExecutionBundle.properties +++ b/platform/platform-resources-en/src/messages/ExecutionBundle.properties @@ -332,7 +332,7 @@ environment.variables.system.dialog.title=System Environment environment.variables.component.title=&Environment variables down.the.stack.trace=Down the stack trace up.the.stack.trace=Up the stack trace -configuration.action.chooser.title=Choose configuration type to run +configuration.action.chooser.title=Choose configuration to run env.vars.checkbox.title=&Include parent environment variables env.vars.show.system=Show