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

IDEA-168781 ui: fix underscore escaping in action presentations

Browse Source
This commit is contained in:
Aleksey Pivovarov
2019-02-06 12:05:28 +03:00
parent a06f99d859
commit 9e80e765e9
2 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/editor-ui-api/src/com/intellij/openapi/actionSystem/Presentation.java
+19 -9
View File
@@ -182,10 +182,7 @@ public final class Presentation implements Cloneable {
}
public String getTextWithMnemonic() {
if (myText != null && myDisplayedMnemonicIndex > -1) {
return myText.substring(0, myDisplayedMnemonicIndex) + "_" + myText.substring(myDisplayedMnemonicIndex);
}
return myText;
return wrapTextWithMnemonic(myText, myDisplayedMnemonicIndex);
}
public void restoreTextWithMnemonic(Presentation presentation) {
@@ -193,15 +190,28 @@ public final class Presentation implements Cloneable {
}
public static String restoreTextWithMnemonic(@Nullable String text, final int mnemonic) {
if (text == null) {
return null;
}
if (text == null) return null;
for (int i = 0; i < text.length(); i++) {
if (Character.toUpperCase(text.charAt(i)) == mnemonic) {
return text.substring(0, i) + "_" + text.substring(i);
return wrapTextWithMnemonic(text, i);
}
}
return text;
return wrapTextWithMnemonic(text, -1);
}
@Nullable
private static String wrapTextWithMnemonic(@Nullable String text, int mnemonicIndex) {
if (text == null) return null;
if (mnemonicIndex > -1) {
String prefix = escapeMnemonicsInActionText(text.substring(0, mnemonicIndex));
String suffix = text.substring(mnemonicIndex);
return prefix + "_" + suffix;
}
return escapeMnemonicsInActionText(text);
}
private static String escapeMnemonicsInActionText(String text) {
return text.replace("_", "__").replace("&", "&&");
}
public String getDescription() {
platform/platform-tests/testSrc/com/intellij/openapi/actionSystem/PresentationTest.java
+29 -5
View File
@@ -13,13 +13,14 @@ public class PresentationTest extends LightPlatformTestCase {
new Data("Pre-last and not unique ch_ar", "Pre-last and not unique ch&ar", "Pre-last and not unique char", "Pre-last and not unique ch_ar", 'A', 26),
new Data("Last cha_r", "Last cha&r", "Last char", "Last cha_r", 'R', 8),
new Data("Too late_", "Too late&", "Too late", "Too late", 0, -1),
new Data("Do__uble", "Do&_uble", "Do_uble", "Do_uble", 0, -1),
new Data("Dou_&ble", "Dou&&ble", "Dou&ble", "Dou&ble", 0, -1),
new Data("Complete double__", "Complete double&_", "Complete double_", "Complete double_", 0, -1),
new Data("Complete double_&", "Complete double&&", "Complete double&", "Complete double&", 0, -1),
new Data("Do__uble", "Do&_uble", "Do_uble", "Do__uble", 0, -1),
new Data("Dou_&ble", "Dou&&ble", "Dou&ble", "Dou&&ble", 0, -1),
new Data("Complete double__", "Complete double&_", "Complete double_", "Complete double__", 0, -1),
new Data("Complete double_&", "Complete double&&", "Complete double&", "Complete double&&", 0, -1),
new Data("Repea_te_d", "Repea&te_d", "Repeate_d", "Repea_te_d", 'T', 5),
new Data("Re_peate&d", "Re&peate&d", "Repeate&d", "Re_peate&d", 'P', 2),
new Data("Run 'test__1' with Co_verage", "Run 'test__1' with Co&verage", "Run 'test_1' with Coverage", "Run 'test_1' with Co_verage", 'V', 20)
new Data("Run 'test__1' with Co_verage", "Run 'test__1' with Co&verage", "Run 'test_1' with Coverage", "Run 'test__1' with Co_verage", 'V', 20),
new Data("R_un 'test_1'", "R&un 'test_1'", "Run 'test_1'", "R_un 'test_1'", 'U', 1),
};
private static class Data {
@@ -65,6 +66,29 @@ public class PresentationTest extends LightPlatformTestCase {
assertTrue(testCase.menuText.length() > p.getDisplayedMnemonicIndex());
}
for (Data testCase : data) {
Presentation p1 = new Presentation();
p1.setText(testCase.inputTextsUnderscore);
Presentation p2 = new Presentation();
p2.setText(p1.getTextWithMnemonic());
assertEquals(p1.getText(), p2.getText());
assertEquals(p1.getMnemonic(), p2.getMnemonic());
assertEquals(p1.getDisplayedMnemonicIndex(), p2.getDisplayedMnemonicIndex());
}
for (Data testCase : data) {
Presentation p1 = new Presentation();
p1.setText(testCase.inputTextsAmpersand);
Presentation p2 = new Presentation();
p2.setText(testCase.inputTextsUnderscore);
assertEquals(p1.getText(), p2.getText());
assertEquals(p1.getMnemonic(), p2.getMnemonic());
assertEquals(p1.getDisplayedMnemonicIndex(), p2.getDisplayedMnemonicIndex());
}
}
@Override