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

FUS-551 Actions invoked with double key are not recorded correctly

Browse Source 
GitOrigin-RevId: 18d41bcf30478dcb8ff661785078bbdc4670751a
This commit is contained in:
Mikhail Sokolov
2020-09-28 16:03:29 +00:00
committed by intellij-monorepo-bot
parent 05f49f9e18
commit 21d02a97f0
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/statistics/src/com/intellij/internal/statistic/eventLog/ShortcutDataProvider.java
+17 -2
View File
@@ -15,6 +15,8 @@ import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
@@ -22,6 +24,11 @@ import static java.awt.event.KeyEvent.*;
@ApiStatus.Internal
public final class ShortcutDataProvider {
/**
* Modifiers that can be used as a separate double click shortcut (Shift+Shift as example)
*/
private static final Collection<Integer> DOUBLE_CLICK_MODIFIER_KEYS = Arrays.asList(VK_CONTROL, VK_SHIFT);
@Nullable
public static String getActionEventText(@Nullable AnActionEvent event) {
return event != null ? getInputEventText(event.getInputEvent(), event.getPlace()) : null;
@@ -86,8 +93,16 @@ public final class ShortcutDataProvider {
}
private static String getShortcutText(KeyboardShortcut shortcut) {
String results = "";
int modifiers = shortcut.getFirstKeyStroke().getModifiers();
int code = shortcut.getFirstKeyStroke().getKeyCode();
// Handling shortcuts that looks like [double <modifier_key>] (to avoid FUS-551)
if (modifiers == 0 && DOUBLE_CLICK_MODIFIER_KEYS.contains(code)) {
String strCode = getLocaleUnawareKeyText(code);
return strCode + "+" + strCode;
}
String results = "";
if (modifiers > 0) {
final String keyModifiersText = getLocaleUnawareKeyModifiersText(modifiers);
if (!keyModifiersText.isEmpty()) {
@@ -95,7 +110,7 @@ public final class ShortcutDataProvider {
}
}
results += getLocaleUnawareKeyText(shortcut.getFirstKeyStroke().getKeyCode());
results += getLocaleUnawareKeyText(code);
return results;
}