MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

test: Trim long RC names, key is run.configuration.max.name.length (40)

Browse Source
This commit is contained in:
Vassiliy.Kudryashov
2017-07-20 23:24:38 +03:00
parent 42a3fb92c6
commit 17d38428c4
5 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/execution/Executor.java
+9 -1
View File
@@ -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);
}
}
platform/lang-api/src/com/intellij/execution/RunManager.kt
-9
View File
@@ -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)
}
}
/**
platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java
+3 -3
View File
@@ -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
platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java
+3 -3
View File
@@ -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 = " ";
}
plugins/coverage-common/src/com/intellij/coverage/CoverageExecutor.java
+1 -1
View File
@@ -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";
}