migrate AnActionEvent without uiKind usages

GitOrigin-RevId: 5ab97ed3a357eadf449ccc2638ba46c6473073e0
2026-01-06 11:50:54 +07:00 · 2024-08-22 19:36:22 +04:00
parent 00ffd92ab2
commit 8b7819ec3f
9 changed files with 28 additions and 28 deletions
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalSystemJdkComboBox.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalSystemJdkComboBox.java
@@ -152,9 +152,8 @@ public final class ExternalSystemJdkComboBox extends ComboBoxWithWidePopup<Exter
          .showUnderneathOf(setUpButton);
      }
      else if (group.getChildrenCount() == 1) {
-        final AnActionEvent event =
-          new AnActionEvent(null, dataContext, ActionPlaces.UNKNOWN, new Presentation(""), ActionManager.getInstance(), 0);
-        group.getChildren(event)[0].actionPerformed(event);
+        AnActionEvent event = AnActionEvent.createEvent(dataContext, null, ActionPlaces.UNKNOWN, ActionUiKind.TOOLBAR, null);
+        group.getChildren(ActionManager.getInstance())[0].actionPerformed(event);
      }
    });
  }
--- a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
+++ b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
@@ -765,10 +765,9 @@ public final class ShowUsagesAction extends AnAction implements PopupAction, Hin
  }

  private static @NotNull AnActionEvent fakeEvent(@NotNull ToggleAction action) {
-    return new AnActionEvent(
-      null, DataContext.EMPTY_CONTEXT, "",
-      action.getTemplatePresentation().clone(), ActionManager.getInstance(), 0
-    );
+    return AnActionEvent.createEvent(
+      DataContext.EMPTY_CONTEXT,
+      action.getTemplatePresentation().clone(), ActionPlaces.UNKNOWN, ActionUiKind.NONE, null);
  }

  private static @NotNull Predicate<? super Usage> originUsageCheck(@Nullable Editor editor) {
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/rider/SearchEverywhereRiderMainToolbarAction.kt
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/rider/SearchEverywhereRiderMainToolbarAction.kt
@@ -16,6 +16,7 @@ import com.intellij.idea.ActionsBundle
 import com.intellij.openapi.actionSystem.*
 import com.intellij.openapi.actionSystem.ex.AnActionListener
 import com.intellij.openapi.actionSystem.impl.ActionButtonWithText
+import com.intellij.openapi.actionSystem.impl.ActionButtonWithText.NORMAL
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.keymap.MacKeymapUtil
@@ -145,15 +146,13 @@ private class SearchEverywhereRiderMainToolbarAction : SearchEverywhereAction(),
        else DataManager.getInstance().dataContext

        if (!firstOpened) {
-          super.actionPerformed(AnActionEvent(
-            e.inputEvent, dataContext, ActionPlaces.RUN_TOOLBAR_LEFT_SIDE, templatePresentation,
-            ActionManager.getInstance(), 0))
+          super.actionPerformed(AnActionEvent.createEvent(
+            dataContext, templatePresentation.clone(), ActionPlaces.RUN_TOOLBAR_LEFT_SIDE, e.uiKind, e.inputEvent))
          firstOpened = true
        }
        else {
-          super.actionPerformed(AnActionEvent(
-            e.inputEvent, dataContext, ActionPlaces.KEYBOARD_SHORTCUT, templatePresentation,
-            ActionManager.getInstance(), 0))
+          super.actionPerformed(AnActionEvent.createEvent(
+            dataContext, templatePresentation.clone(), ActionPlaces.KEYBOARD_SHORTCUT, e.uiKind, e.inputEvent))
        }

      }
--- a/platform/platform-api/src/com/intellij/ui/AnActionButton.java
+++ b/platform/platform-api/src/com/intellij/ui/AnActionButton.java
@@ -242,7 +242,8 @@ public abstract class AnActionButton extends AnAction implements ShortcutProvide
    private final AnActionButton myPeer;

    private AnActionEventWrapper(AnActionEvent e, AnActionButton peer) {
-      super(e.getInputEvent(), e.getDataContext(), e.getPlace(), e.getPresentation(), e.getActionManager(), e.getModifiers());
+      super(e.getDataContext(), e.getPresentation(), e.getPlace(),
+            e.getUiKind(), e.getInputEvent(), e.getModifiers(), e.getActionManager());
      myPeer = peer;
    }

--- a/platform/platform-api/src/com/intellij/ui/tabs/impl/ActionButton.java
+++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/ActionButton.java
@@ -155,8 +155,8 @@ class ActionButton implements ActionListener {
    DataContext dataContext = CustomizedDataContext.withSnapshot(parent, sink -> {
      sink.set(CommonDataKeys.VIRTUAL_FILE, ObjectUtils.tryCast(myTabInfo.getObject(), VirtualFile.class));
    });
-    return new AnActionEvent(inputEvent, dataContext, myPlace != null ? myPlace : ActionPlaces.UNKNOWN, presentation,
-                             ActionManager.getInstance(), modifiers);
+    return new AnActionEvent(dataContext, presentation, myPlace != null ? myPlace : ActionPlaces.UNKNOWN,
+                             ActionUiKind.TOOLBAR, inputEvent, modifiers, ActionManager.getInstance());
  }

  public void setAutoHide(final boolean autoHide) {
--- a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.kt
+++ b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.kt
@@ -697,9 +697,8 @@ object Switcher : BaseSwitcherAction(null) {
        val dataContext = CustomizedDataContext.withSnapshot(focusDC) { sink ->
          sink[PlatformDataKeys.PREDEFINED_TEXT] = fileName
        }
-        val event = AnActionEvent(e, dataContext, "Switcher",
-                                  gotoAction.templatePresentation.clone(),
-                                  ActionManager.getInstance(), 0)
+        val event = AnActionEvent.createEvent(dataContext, gotoAction.templatePresentation.clone(),
+                                              "Switcher", ActionUiKind.NONE, e)
        blockingContext {
          ActionUtil.performActionDumbAwareWithCallbacks(gotoAction, event)
        }
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/keyGestures/GestureActionEvent.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/keyGestures/GestureActionEvent.java
@@ -2,17 +2,19 @@
 package com.intellij.openapi.keymap.impl.keyGestures;

 import com.intellij.openapi.actionSystem.ActionManager;
+import com.intellij.openapi.actionSystem.ActionUiKind;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.AnActionEventVisitor;
 import org.jetbrains.annotations.NotNull;

 public class GestureActionEvent extends AnActionEvent {
  public GestureActionEvent(KeyboardGestureProcessor processor) {
-    super(processor.myContext.actionKey,
-          processor.myContext.dataContext,
+    super(processor.myContext.dataContext,
+          processor.myContext.actionPresentation,
          processor.myContext.actionPlace,
-          processor.myContext.actionPresentation, ActionManager.getInstance(),
-          0);
+          ActionUiKind.NONE,
+          processor.myContext.actionKey, 0,
+          ActionManager.getInstance());
  }

  public static final class Init extends GestureActionEvent {
--- a/plugins/evaluation-plugin/src/com/intellij/cce/evaluable/rename/RenameInvoker.kt
+++ b/plugins/evaluation-plugin/src/com/intellij/cce/evaluable/rename/RenameInvoker.kt
@@ -12,10 +12,10 @@ import com.intellij.cce.interpreter.FeatureInvoker
 import com.intellij.codeInsight.lookup.LookupManager
 import com.intellij.codeInsight.lookup.impl.LookupImpl
 import com.intellij.completion.ml.actions.MLCompletionFeaturesUtil
-import com.intellij.openapi.actionSystem.ActionManager
+import com.intellij.openapi.actionSystem.ActionPlaces
+import com.intellij.openapi.actionSystem.ActionUiKind
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.actionSystem.Presentation
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.fileEditor.FileDocumentManager
@@ -47,7 +47,7 @@ class RenameInvoker(private val project: Project,
    val start = System.currentTimeMillis()

    val dataContext = buildDataContext(editor)
-    val anActionEvent = AnActionEvent(null, dataContext, "", Presentation(), ActionManager.getInstance(), 0)
+    val anActionEvent = AnActionEvent.createEvent(dataContext, null, ActionPlaces.UNKNOWN, ActionUiKind.NONE, null)
    RenameElementAction().actionPerformed(anActionEvent)

    val activeLookup = LookupManager.getActiveLookup(editor)
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationInsertImportOnPasteTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationInsertImportOnPasteTest.kt
@@ -3,9 +3,9 @@
 package org.jetbrains.kotlin.idea.script

 import com.intellij.openapi.actionSystem.ActionPlaces
+import com.intellij.openapi.actionSystem.ActionUiKind
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.IdeActions
-import com.intellij.openapi.actionSystem.Presentation
 import com.intellij.openapi.actionSystem.ex.ActionManagerEx
 import com.intellij.openapi.actionSystem.ex.ActionUtil
 import com.intellij.openapi.editor.ex.EditorEx
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.idea.base.codeInsight.copyPaste.KotlinCopyPasteActio
 import org.jetbrains.kotlin.idea.base.codeInsight.copyPaste.KotlinCopyPasteActionInfo.importsToBeDeleted
 import org.jetbrains.kotlin.idea.base.codeInsight.copyPaste.KotlinCopyPasteActionInfo.importsToBeReviewed
 import org.jetbrains.kotlin.idea.base.test.InTextDirectivesUtils
+import org.jetbrains.kotlin.idea.completion.test.KotlinCompletionTestCase.assertEquals
 import org.jetbrains.kotlin.idea.test.KotlinTestUtils
 import org.jetbrains.kotlin.idea.test.dumpTextWithErrors
 import org.jetbrains.kotlin.psi.KtFile
@@ -79,7 +80,7 @@ abstract class AbstractScriptConfigurationInsertImportOnPasteTest : AbstractScri
        val dataContext = getEditorDataContext()
        val managerEx = ActionManagerEx.getInstanceEx()
        val action = managerEx.getAction(actionId)
-        val event = AnActionEvent(null, dataContext, ActionPlaces.UNKNOWN, Presentation(), managerEx, 0)
+        val event = AnActionEvent.createEvent(dataContext, null, ActionPlaces.UNKNOWN, ActionUiKind.NONE, null)
        ActionUtil.performDumbAwareUpdate(action, event, false)
        if (event.presentation.isEnabled) {
            ActionUtil.performActionDumbAwareWithCallbacks(action, event)