From 59cdfcbc5852a433deb4049dfdf5304c201a8777 Mon Sep 17 00:00:00 2001
From: "Dmitry.Krasilschikov" <kradima@jetbrains.com>
Date: Fri, 8 Jun 2018 14:18:20 +0300
Subject: [PATCH] IDEA-CR-33342 trigger feature used on escape/execute command

---
 .../ide/actions/runAnything/RunAnythingAction.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/actions/runAnything/RunAnythingAction.java b/platform/lang-impl/src/com/intellij/ide/actions/runAnything/RunAnythingAction.java
index eefc2a9c5e29..e5acfca5b30e 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/runAnything/RunAnythingAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/runAnything/RunAnythingAction.java
@@ -429,6 +429,8 @@ public class RunAnythingAction extends AnAction implements CustomComponentAction
       onDone = () -> RunAnythingUtil.executeMatched(dataContext, pattern);
     }
     finally {
+      triggerUsed();
+
       final ActionCallback callback = onPopupFocusLost();
       if (onDone != null) {
         callback.doWhenDone(onDone);
@@ -859,9 +861,7 @@ public class RunAnythingAction extends AnAction implements CustomComponentAction
                    .registerCustomShortcutSet(CustomShortcutSet.fromString("shift TAB"), editor, balloon);
     AnAction escape = ActionManager.getInstance().getAction("EditorEscape");
     DumbAwareAction.create(e -> {
-      if (myIsUsedTrigger) {
-        FeatureUsageTracker.getInstance().triggerFeatureUsed(RUN_ANYTHING);
-      }
+      triggerUsed();
 
       if (myBalloon != null && myBalloon.isVisible()) {
         myBalloon.cancel();
@@ -921,6 +921,13 @@ public class RunAnythingAction extends AnAction implements CustomComponentAction
     }.registerCustomShortcutSet(CustomShortcutSet.fromString("LEFT"), editor, balloon);
   }
 
+  private void triggerUsed() {
+    if (myIsUsedTrigger) {
+      FeatureUsageTracker.getInstance().triggerFeatureUsed(RUN_ANYTHING);
+    }
+    myIsUsedTrigger = false;
+  }
+
 
   public void setAdText(@NotNull final String s) {
     myPopup.setAdText(s, SwingConstants.LEFT);
@@ -1247,7 +1254,6 @@ public class RunAnythingAction extends AnAction implements CustomComponentAction
                     }
                   }
                   myActionEvent = null;
-                  myIsUsedTrigger = false;
                   myLastInputText = null;
                 });
               }