diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java index 601b7611ace6..ce98ae568511 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java @@ -334,7 +334,7 @@ public abstract class GotoActionBase extends AnAction { } else { seManager.setShownContributor(searchProviderID); - FUSUsageContext context = Optional.ofNullable(KeymapUtil.getEventCallerShortcut(evnt)) + FUSUsageContext context = Optional.ofNullable(KeymapUtil.getEventCallerKeystrokeText(evnt)) .map(shortcut -> FUSUsageContext.create(searchProviderID, shortcut)) .orElseGet(() -> FUSUsageContext.create(searchProviderID)); SearchEverywhereUsageTriggerCollector.trigger(evnt.getProject(), SearchEverywhereUsageTriggerCollector.TAB_SWITCHED, context); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java index c0f2477d45dc..fd7b3c6bb567 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java @@ -579,7 +579,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA } else { seManager.setShownContributor(searchProviderID); - FUSUsageContext context = Optional.ofNullable(KeymapUtil.getEventCallerShortcut(e)) + FUSUsageContext context = Optional.ofNullable(KeymapUtil.getEventCallerKeystrokeText(e)) .map(shortcut -> FUSUsageContext.create(searchProviderID, shortcut)) .orElseGet(() -> FUSUsageContext.create(searchProviderID)); SearchEverywhereUsageTriggerCollector.trigger(e.getProject(), SearchEverywhereUsageTriggerCollector.TAB_SWITCHED, context); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java index fd072f82ec29..c72f0b67ff0b 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java @@ -700,7 +700,7 @@ public class SearchEverywhereUI extends BigPopupUI implements DataProvider, Quic } private static Optional getEventShortcut(AnActionEvent event) { - return Optional.ofNullable(KeymapUtil.getEventCallerShortcut(event)); + return Optional.ofNullable(KeymapUtil.getEventCallerKeystrokeText(event)); } private void triggerTabSwitched(AnActionEvent e) { diff --git a/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java b/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java index ef8a22a07cf8..d4c027ba2614 100644 --- a/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java +++ b/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java @@ -611,7 +611,7 @@ public class KeymapUtil { * @return string presentation of shortcut if {@code event} was called with shortcut. In other cases null is returned */ @Nullable - public static String getEventCallerShortcut(@NotNull AnActionEvent event) { + public static String getEventCallerKeystrokeText(@NotNull AnActionEvent event) { if (event.getInputEvent() instanceof KeyEvent) { KeyEvent ke = (KeyEvent)event.getInputEvent(); return getKeystrokeText(KeyStroke.getKeyStroke(ke.getKeyCode(), ke.getModifiers()));