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

revert for commit separation

Browse Source
This commit is contained in:
Evgeny Zakrevsky
2012-10-20 03:12:15 +04:00
parent 9af9e626e5
commit dc7a45aa02
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacroManager.java
+22 -22
View File
@@ -549,38 +549,38 @@ public class ActionMacroManager implements ExportableApplicationComponent, Named
}
public void postProcessKeyEvent(KeyEvent e) {
if (e.getID() != KeyEvent.KEY_PRESSED) return;
if (myLastActionInputEvent.contains(e)) {
myLastActionInputEvent.remove(e);
return;
}
final boolean modifierKeyIsPressed = e.getKeyCode() == KeyEvent.VK_CONTROL ||
e.getKeyCode() == KeyEvent.VK_ALT ||
e.getKeyCode() == KeyEvent.VK_META ||
e.getKeyCode() == KeyEvent.VK_SHIFT;
if (modifierKeyIsPressed) return;
final boolean waiting = !IdeEventQueue.getInstance().getKeyEventDispatcher().isReady();
final boolean ready = IdeEventQueue.getInstance().getKeyEventDispatcher().isReady();
final boolean isChar = e.getKeyChar() != KeyEvent.CHAR_UNDEFINED && UIUtil.isReallyTypedEvent(e);
final boolean hasActionModifiers = e.isAltDown() | e.isControlDown() | e.isMetaDown();
final boolean plainType = isChar && !hasActionModifiers;
boolean hasActionModifiers = e.isAltDown() | e.isControlDown() | e.isMetaDown();
boolean plainType = isChar && !hasActionModifiers;
final boolean isEnter = e.getKeyCode() == KeyEvent.VK_ENTER;
if (plainType && ready && !isEnter) {
boolean noModifierKeyIsPressed = e.getKeyCode() != KeyEvent.VK_CONTROL
&& e.getKeyCode() != KeyEvent.VK_ALT
&& e.getKeyCode() != KeyEvent.VK_META
&& e.getKeyCode() != KeyEvent.VK_SHIFT;
if (e.getID() == KeyEvent.KEY_PRESSED && (plainType && !waiting) && !isEnter) {
myRecordingMacro.appendKeytyped(e.getKeyChar(), e.getKeyCode(), e.getModifiers());
notifyUser(Character.valueOf(e.getKeyChar()).toString(), true);
}
else if ((!plainType && ready) || isEnter) {
final String stroke = KeyStroke.getKeyStrokeForEvent(e).toString();
else if (e.getID() == KeyEvent.KEY_PRESSED && noModifierKeyIsPressed && (!plainType || isEnter)) {
if ((!myLastActionInputEvent.contains(e) && !waiting) || isEnter) {
final String stroke = KeyStroke.getKeyStrokeForEvent(e).toString();
final int pressed = stroke.indexOf("pressed");
String key = stroke.substring(pressed + "pressed".length());
String modifiers = stroke.substring(0, pressed);
final int pressed = stroke.indexOf("pressed");
String key = stroke.substring(pressed + "pressed".length());
String modifiers = stroke.substring(0, pressed);
String shortcut = (modifiers.replaceAll("ctrl", "control").trim() + " " + key.trim()).trim();
String ready = (modifiers.replaceAll("ctrl", "control").trim() + " " + key.trim()).trim();
myRecordingMacro.appendShortcut(shortcut);
notifyUser(KeymapUtil.getKeystrokeText(KeyStroke.getKeyStrokeForEvent(e)), false);
myRecordingMacro.appendShortcut(ready);
notifyUser(KeymapUtil.getKeystrokeText(KeyStroke.getKeyStrokeForEvent(e)), false);
if (!isEnter) {
myLastActionInputEvent.remove(e);
}
}
}
}
}