Skip to content

Commit 0c3caa1

Browse files
authored
fix(toolkit): fix deprecated call to list action group children (#5616)
In 2025.1, `ActionGroup#getChildren(AnActionEvent)` is deprecated
1 parent 25f28ad commit 0c3caa1

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/AbstractExplorerTreeToolWindow.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import com.intellij.ide.util.treeView.NodeDescriptor
1111
import com.intellij.ide.util.treeView.NodeRenderer
1212
import com.intellij.ide.util.treeView.TreeState
1313
import com.intellij.openapi.Disposable
14-
import com.intellij.openapi.actionSystem.ActionGroup
1514
import com.intellij.openapi.actionSystem.ActionManager
1615
import com.intellij.openapi.actionSystem.AnAction
1716
import com.intellij.openapi.actionSystem.AnActionEvent
@@ -87,10 +86,10 @@ abstract class AbstractExplorerTreeToolWindow(
8786
if (node is ActionGroupOnRightClick) {
8887
val actionGroupName = node.actionGroupName()
8988

90-
(actionGroupName.let { groupName -> actionManager.getAction(groupName) } as? ActionGroup)?.let { group ->
89+
(actionGroupName.let { groupName -> actionManager.getAction(groupName) } as? DefaultActionGroup)?.let { group ->
9190
val context = comp?.let { DataManager.getInstance().getDataContext(it, x, y) } ?: return@let
9291
val event = AnActionEvent.createFromDataContext(actionPlace, null, context)
93-
totalActions.addAll(group.getChildren(event))
92+
totalActions.addAll(group.getChildren(actionManager))
9493
}
9594
}
9695

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/ExplorerToolWindow.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import com.intellij.ide.util.treeView.NodeDescriptor
1010
import com.intellij.ide.util.treeView.NodeRenderer
1111
import com.intellij.ide.util.treeView.TreeState
1212
import com.intellij.openapi.Disposable
13-
import com.intellij.openapi.actionSystem.ActionGroup
1413
import com.intellij.openapi.actionSystem.ActionPlaces
1514
import com.intellij.openapi.actionSystem.AnAction
1615
import com.intellij.openapi.actionSystem.AnActionEvent
@@ -313,7 +312,7 @@ class ExplorerToolWindow(private val project: Project) :
313312

314313
val totalActions = mutableListOf<AnAction>()
315314

316-
(actionGroupName?.let { actionManager.getAction(it) } as? ActionGroup)?.let { totalActions.addAll(it.getChildren(null)) }
315+
(actionGroupName?.let { actionManager.getAction(it) } as? DefaultActionGroup)?.let { totalActions.addAll(it.getChildren(actionManager)) }
317316

318317
if (explorerNode is AwsExplorerResourceNode<*>) {
319318
totalActions.add(CopyArnAction())

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/devToolsTab/nodes/CawsRootNode.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ package software.aws.toolkits.jetbrains.core.explorer.devToolsTab.nodes
55

66
import com.intellij.ide.projectView.PresentationData
77
import com.intellij.ide.util.treeView.AbstractTreeNode
8-
import com.intellij.openapi.actionSystem.ActionGroup
98
import com.intellij.openapi.actionSystem.ActionManager
9+
import com.intellij.openapi.actionSystem.DefaultActionGroup
1010
import com.intellij.openapi.project.Project
1111
import com.intellij.ui.SimpleTextAttributes
1212
import software.aws.toolkits.jetbrains.ToolkitPlaces
@@ -28,8 +28,8 @@ class CawsRootNode(private val nodeProject: Project) : AbstractTreeNode<String>(
2828
is ActiveConnection.ValidBearer -> CAWS_SIGNED_IN_ACTION_GROUP
2929
else -> CAWS_EXPIRED_TOKEN_ACTION_GROUP
3030
}
31-
val actions = ActionManager.getInstance().getAction(groupId) as ActionGroup
32-
return actions.getChildren(null).mapNotNull {
31+
val actions = ActionManager.getInstance().getAction(groupId) as DefaultActionGroup
32+
return actions.getChildren(ActionManager.getInstance()).mapNotNull {
3333
if (it is OpenWorkspaceInGateway && isRunningOnRemoteBackend()) {
3434
return@mapNotNull null
3535
}

0 commit comments

Comments
 (0)