diff --git a/platform/lang-api/src/com/intellij/execution/Executor.java b/platform/lang-api/src/com/intellij/execution/Executor.java index 5afe8fd858c5..5a8eb8f26ba9 100644 --- a/platform/lang-api/src/com/intellij/execution/Executor.java +++ b/platform/lang-api/src/com/intellij/execution/Executor.java @@ -17,6 +17,7 @@ package com.intellij.execution; import com.intellij.openapi.extensions.ExtensionPointName; +import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -88,6 +89,13 @@ public abstract class Executor { public abstract String getHelpId(); public String getStartActionText(String configurationName) { - return getStartActionText() + (StringUtil.isEmpty(configurationName) ? "" : " '" + RunManager.getShortenName(configurationName) + "'"); + return getStartActionText() + (StringUtil.isEmpty(configurationName) ? "" : " '" + getShortenName(configurationName) + "'"); + } + + /** + * Too long names don't fit into UI controls and has to be trimmed + */ + public static String getShortenName(@NotNull String name) { + return StringUtil.first(name, Registry.intValue("run.configuration.max.name.length", 40), true); } } diff --git a/platform/lang-api/src/com/intellij/execution/RunManager.kt b/platform/lang-api/src/com/intellij/execution/RunManager.kt index d31fb6791524..bd0ebc7d2def 100644 --- a/platform/lang-api/src/com/intellij/execution/RunManager.kt +++ b/platform/lang-api/src/com/intellij/execution/RunManager.kt @@ -23,7 +23,6 @@ import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.project.Project import com.intellij.openapi.util.Key -import com.intellij.openapi.util.registry.Registry import com.intellij.openapi.util.text.StringUtil import com.intellij.util.text.nullize import java.util.regex.Pattern @@ -57,14 +56,6 @@ abstract class RunManager { i++ } } - - /** - * Too long names don't fit into UI controls and has to be trimmed - */ - @JvmStatic - fun getShortenName(name: String): String { - return StringUtil.first(name, Registry.intValue("run.configuration.max.name.length", 40), true) - } } /** diff --git a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java index 2f23700fe81d..0f8a8f31404e 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java @@ -353,7 +353,7 @@ public class ChooseRunConfigurationPopup implements ExecutorProvider { @Override public String getText() { - return RunManager.getShortenName(getValue().getName()); + return Executor.getShortenName(getValue().getName()); } @Override @@ -512,7 +512,7 @@ public class ChooseRunConfigurationPopup implements ExecutorProvider { } public String getName() { - return RunManager.getShortenName(mySettings.getName()); + return Executor.getShortenName(mySettings.getName()); } public Icon getIcon() { @@ -1071,7 +1071,7 @@ public class ChooseRunConfigurationPopup implements ExecutorProvider { @Override public String getText() { - return RunManager.getShortenName(configuration.getName()); + return Executor.getShortenName(configuration.getName()); } @Override diff --git a/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java b/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java index 3a4beccb2e54..ccc7cc0088e8 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java @@ -81,7 +81,7 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D @Nullable Project project, @NotNull Presentation presentation) { if (project != null && target != null && settings != null) { - String name = RunManager.getShortenName(settings.getName()); + String name = Executor.getShortenName(settings.getName()); if (target != DefaultExecutionTarget.INSTANCE) { name += " | " + target.getDisplayName(); } else { @@ -207,7 +207,7 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D disable(presentation); } else { - presentation.setText(ExecutionBundle.message("save.temporary.run.configuration.action.name", RunManager.getShortenName(settings.getName()))); + presentation.setText(ExecutionBundle.message("save.temporary.run.configuration.action.name", Executor.getShortenName(settings.getName()))); presentation.setDescription(presentation.getText()); presentation.setVisible(true); presentation.setEnabled(true); @@ -268,7 +268,7 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D public SelectConfigAction(final RunnerAndConfigurationSettings configuration, final Project project) { myConfiguration = configuration; myProject = project; - String name = RunManager.getShortenName(configuration.getName()); + String name = Executor.getShortenName(configuration.getName()); if (name.isEmpty()) { name = " "; } diff --git a/plugins/coverage-common/src/com/intellij/coverage/CoverageExecutor.java b/plugins/coverage-common/src/com/intellij/coverage/CoverageExecutor.java index 1a38ba9ce3ee..3761bee92958 100644 --- a/plugins/coverage-common/src/com/intellij/coverage/CoverageExecutor.java +++ b/plugins/coverage-common/src/com/intellij/coverage/CoverageExecutor.java @@ -19,7 +19,7 @@ public class CoverageExecutor extends Executor { @Override public String getStartActionText(String configurationName) { - final String name = configurationName != null ? escapeMnemonicsInConfigurationName(StringUtil.first(configurationName, 30, true)) : null; + final String name = configurationName != null ? escapeMnemonicsInConfigurationName(getShortenName(configurationName)) : null; return "Run" + (StringUtil.isEmpty(name) ? "" : " '" + name + "'") + " with Co_verage"; }