From 21d02a97f07096bfe06586c7690a3b2186ecd15e Mon Sep 17 00:00:00 2001
From: Mikhail Sokolov <mikhail.sokolov@jetbrains.com>
Date: Mon, 28 Sep 2020 19:02:47 +0300
Subject: [PATCH] FUS-551 Actions invoked with double key are not recorded
 correctly

GitOrigin-RevId: 18d41bcf30478dcb8ff661785078bbdc4670751a
---
 .../eventLog/ShortcutDataProvider.java        | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/platform/statistics/src/com/intellij/internal/statistic/eventLog/ShortcutDataProvider.java b/platform/statistics/src/com/intellij/internal/statistic/eventLog/ShortcutDataProvider.java
index 6ac6ccbc6026..b8742beeb472 100644
--- a/platform/statistics/src/com/intellij/internal/statistic/eventLog/ShortcutDataProvider.java
+++ b/platform/statistics/src/com/intellij/internal/statistic/eventLog/ShortcutDataProvider.java
@@ -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;
   }