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

give default shortcut in productivity tips if missing in current keymap (IDEA-109779)

Browse Source
This commit is contained in:
peter
2013-07-05 17:36:06 +02:00
parent 2aa19e8888
commit c08cf14b88
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/util/TipUIUtil.java
+24 -6
View File
@@ -20,11 +20,14 @@ import com.intellij.openapi.actionSystem.KeyboardShortcut;
import com.intellij.openapi.actionSystem.Shortcut;
import com.intellij.openapi.application.ApplicationInfo;
import com.intellij.openapi.application.ApplicationNamesInfo;
import com.intellij.openapi.keymap.Keymap;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.keymap.KeymapUtil;
import com.intellij.openapi.keymap.impl.DefaultKeymap;
import com.intellij.util.ResourceUtil;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.io.IOException;
@@ -92,16 +95,31 @@ public class TipUIUtil {
return;
}
final String actionId = text.substring(actionIdStart, actionIdEnd);
final Shortcut[] shortcuts = KeymapManager.getInstance().getActiveKeymap().getShortcuts(actionId);
String shortcutText = "";
for (final Shortcut shortcut : shortcuts) {
if (shortcut instanceof KeyboardShortcut) {
shortcutText = KeymapUtil.getShortcutText(shortcut);
break;
String shortcutText = getShortcutText(actionId, KeymapManager.getInstance().getActiveKeymap());
if (shortcutText == null) {
Keymap defKeymap = KeymapManager.getInstance().getKeymap(DefaultKeymap.getInstance().getDefaultKeymapName());
if (defKeymap != null) {
shortcutText = getShortcutText(actionId, defKeymap);
if (shortcutText != null) {
shortcutText += " in default keymap";
}
}
}
if (shortcutText == null) {
shortcutText = "<no shortcut for action " + actionId + ">";
}
text.replace(lastIndex, actionIdEnd + 1, shortcutText);
lastIndex += shortcutText.length();
}
}
@Nullable
private static String getShortcutText(String actionId, Keymap keymap) {
for (final Shortcut shortcut : keymap.getShortcuts(actionId)) {
if (shortcut instanceof KeyboardShortcut) {
return KeymapUtil.getShortcutText(shortcut);
}
}
return null;
}
}
platform/platform-resources-en/src/tips/TabInLookups.html
+1 -1
View File
@@ -6,7 +6,7 @@
<p>When using Code Completion, you can accept the currently highlighted selection in the popup list
with the <span class="shortcut">&shortcut:EditorChooseLookupItemReplace;</span> key.</p>
with <span class="shortcut">&shortcut:EditorChooseLookupItemReplace;</span> key.</p>
<p>Unlike accepting with the <span class="shortcut">&shortcut:EditorChooseLookupItem;</span> key, the selected name will overwrite
the rest of the name to the right of the caret. This can be especially useful for replacing one method
or variable name with another.</p>