From d5ce47f522b4a3c062cfbc31e1569ddfb1f6a36e Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Mon, 15 Jul 2019 23:04:48 +0300 Subject: [PATCH] FUS-463 Implement collectors for Show Usages popup GitOrigin-RevId: cec81b97b962154bd0d6c30ee258a0b98fcebaec --- .../com/intellij/find/actions/ShowUsagesAction.java | 12 +++++++++--- .../actions/persistence/ActionsCollectorImpl.java | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java index f53fc0dc2ce7..e93c33d091ab 100644 --- a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java +++ b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java @@ -14,6 +14,7 @@ import com.intellij.find.impl.FindManagerImpl; import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.ide.util.gotoByName.ModelDiff; +import com.intellij.internal.statistic.service.fus.collectors.FUCounterUsageLogger; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadAction; @@ -46,7 +47,10 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.SearchScope; -import com.intellij.ui.*; +import com.intellij.ui.ActiveComponent; +import com.intellij.ui.InplaceButton; +import com.intellij.ui.ScreenUtil; +import com.intellij.ui.ScrollingUtil; import com.intellij.ui.awt.RelativePoint; import com.intellij.ui.popup.AbstractPopup; import com.intellij.ui.popup.PopupUpdateProcessor; @@ -59,7 +63,8 @@ import com.intellij.util.Alarm; import com.intellij.util.ArrayUtil; import com.intellij.util.Processor; import com.intellij.util.messages.MessageBusConnection; -import com.intellij.util.ui.*; +import com.intellij.util.ui.AsyncProcessIcon; +import com.intellij.util.ui.UIUtil; import com.intellij.xml.util.XmlStringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -67,8 +72,8 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.table.TableColumn; import java.awt.*; -import java.util.*; import java.util.List; +import java.util.*; import java.util.concurrent.atomic.AtomicInteger; public class ShowUsagesAction extends AnAction implements PopupAction { @@ -428,6 +433,7 @@ public class ShowUsagesAction extends AnAction implements PopupAction { @NotNull RelativePoint popupPosition, Editor editor, int maxUsages, int minWidth) { + FUCounterUsageLogger.getInstance().logEvent("toolbar", "ShowUsagesPopup.showSettings"); AbstractFindUsagesDialog dialog = handler.getFindUsagesDialog(false, false, false); if (dialog.showAndGet()) { dialog.calcFindUsagesOptions(); diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/ActionsCollectorImpl.java b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/ActionsCollectorImpl.java index 699f2c39918f..601208fe8648 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/ActionsCollectorImpl.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/ActionsCollectorImpl.java @@ -43,7 +43,7 @@ public class ActionsCollectorImpl extends ActionsCollector { private static final Set ourCustomActionWhitelist = ContainerUtil.newHashSet( "tooltip.actions.execute", "tooltip.actions.show.all", "tooltip.actions.show.description.gear", "tooltip.actions.show.description.shortcut", "tooltip.actions.show.description.morelink", - "regexp.help", + "regexp.help", "ShowUsagesPopup.showSettings", "Ics.action.MergeSettings.text", "Ics.action.MergeSettings.text", "Ics.action.ResetToMySettings.text", "Reload Classes", "Progress Paused", "Progress Resumed", "DialogCancelAction", "DialogOkAction", "DoubleShortcut" );