From 13220b3f68d360019ab6bbf4b7bf46ee79e60707 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Thu, 21 Mar 2024 04:14:52 +0400
Subject: [PATCH] fix NonEmptyActionGroup.actionUpdateThread

GitOrigin-RevId: b9afaea7b74e1da4f0c724bc36bb3c905ed1de80
---
 .../com/intellij/ide/actions/NonEmptyActionGroup.java    | 2 +-
 .../git4idea/index/actions/GitStageIndexFileMenuGroup.kt | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/actions/NonEmptyActionGroup.java b/platform/platform-impl/src/com/intellij/ide/actions/NonEmptyActionGroup.java
index ff726478c323..f133c8f37bcb 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/NonEmptyActionGroup.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/NonEmptyActionGroup.java
@@ -22,7 +22,7 @@ public class NonEmptyActionGroup extends DefaultActionGroup implements DumbAware
 
   @Override
   public @NotNull ActionUpdateThread getActionUpdateThread() {
-    return getClass() == NonEmptyActionGroup.class ? ActionUpdateThread.BGT : super.getActionUpdateThread();
+    return ActionUpdateThread.BGT;
   }
 
   @Override
diff --git a/plugins/git4idea/src/git4idea/index/actions/GitStageIndexFileMenuGroup.kt b/plugins/git4idea/src/git4idea/index/actions/GitStageIndexFileMenuGroup.kt
index 10d5b0c5187b..0a963259c8a2 100644
--- a/plugins/git4idea/src/git4idea/index/actions/GitStageIndexFileMenuGroup.kt
+++ b/plugins/git4idea/src/git4idea/index/actions/GitStageIndexFileMenuGroup.kt
@@ -2,17 +2,16 @@
 package git4idea.index.actions
 
 import com.intellij.ide.actions.NonEmptyActionGroup
-import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
 import git4idea.index.vfs.GitIndexVirtualFile
 
 class GitStageIndexFileMenuGroup : NonEmptyActionGroup() {
 
-  override fun getActionUpdateThread() = ActionUpdateThread.BGT
-
   override fun update(event: AnActionEvent) {
-    event.presentation.isVisible = childrenCount > 0 &&
-                                   event.getData(CommonDataKeys.VIRTUAL_FILE) is GitIndexVirtualFile
+    super.update(event)
+    event.presentation.isVisible =
+      event.presentation.isVisible &&
+      event.getData(CommonDataKeys.VIRTUAL_FILE) is GitIndexVirtualFile
   }
 }
\ No newline at end of file