Skip to content

fix(toolkit): fix deprecated call to list action group children #5616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 27, 2025
Merged

fix(toolkit): fix deprecated call to list action group children #5616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c51381a
fix(toolkit): fix deprecated call to list action group children
rli Apr 22, 2025
2fcab35
Merge remote-tracking branch 'origin/main' into rli/deprecated-getchi…
rli May 27, 2025
3d5b5d1
lint
rli May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...-core/src/software/aws/toolkits/jetbrains/core/explorer/AbstractExplorerTreeToolWindow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import com.intellij.ide.util.treeView.NodeRenderer
import com.intellij.ide.util.treeView.TreeState
import com.intellij.openapi.Disposable
import com.intellij.openapi.actionSystem.ActionGroup
import com.intellij.openapi.actionSystem.ActionManager
import com.intellij.openapi.actionSystem.AnAction
import com.intellij.openapi.actionSystem.AnActionEvent
Expand Down Expand Up @@ -87,10 +86,10 @@
if (node is ActionGroupOnRightClick) {
val actionGroupName = node.actionGroupName()

(actionGroupName.let { groupName -> actionManager.getAction(groupName) } as? ActionGroup)?.let { group ->
(actionGroupName.let { groupName -> actionManager.getAction(groupName) } as? DefaultActionGroup)?.let { group ->
val context = comp?.let { DataManager.getInstance().getDataContext(it, x, y) } ?: return@let
val event = AnActionEvent.createFromDataContext(actionPlace, null, context)
totalActions.addAll(group.getChildren(event))
totalActions.addAll(group.getChildren(actionManager))

Check warning on line 92 in plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/AbstractExplorerTreeToolWindow.kt

View check run for this annotation

Codecov / codecov/patch

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

Added line #L92 was not covered by tests
}
}

Expand Down
3 changes: 1 addition & 2 deletions ...it/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/ExplorerToolWindow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import com.intellij.ide.util.treeView.NodeDescriptor
import com.intellij.ide.util.treeView.NodeRenderer
import com.intellij.ide.util.treeView.TreeState
import com.intellij.openapi.Disposable
import com.intellij.openapi.actionSystem.ActionGroup
import com.intellij.openapi.actionSystem.ActionPlaces
import com.intellij.openapi.actionSystem.AnAction
import com.intellij.openapi.actionSystem.AnActionEvent
Expand Down Expand Up @@ -313,7 +312,7 @@ class ExplorerToolWindow(private val project: Project) :

val totalActions = mutableListOf<AnAction>()

(actionGroupName?.let { actionManager.getAction(it) } as? ActionGroup)?.let { totalActions.addAll(it.getChildren(null)) }
(actionGroupName?.let { actionManager.getAction(it) } as? DefaultActionGroup)?.let { totalActions.addAll(it.getChildren(actionManager)) }

if (explorerNode is AwsExplorerResourceNode<*>) {
totalActions.add(CopyArnAction())
Expand Down
6 changes: 3 additions & 3 deletions ...-core/src/software/aws/toolkits/jetbrains/core/explorer/devToolsTab/nodes/CawsRootNode.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package software.aws.toolkits.jetbrains.core.explorer.devToolsTab.nodes

import com.intellij.ide.projectView.PresentationData
import com.intellij.ide.util.treeView.AbstractTreeNode
import com.intellij.openapi.actionSystem.ActionGroup
import com.intellij.openapi.actionSystem.ActionManager
import com.intellij.openapi.actionSystem.DefaultActionGroup
import com.intellij.openapi.project.Project
import com.intellij.ui.SimpleTextAttributes
import software.aws.toolkits.jetbrains.ToolkitPlaces
Expand All @@ -28,8 +28,8 @@ class CawsRootNode(private val nodeProject: Project) : AbstractTreeNode<String>(
is ActiveConnection.ValidBearer -> CAWS_SIGNED_IN_ACTION_GROUP
else -> CAWS_EXPIRED_TOKEN_ACTION_GROUP
}
val actions = ActionManager.getInstance().getAction(groupId) as ActionGroup
return actions.getChildren(null).mapNotNull {
val actions = ActionManager.getInstance().getAction(groupId) as DefaultActionGroup
return actions.getChildren(ActionManager.getInstance()).mapNotNull {
if (it is OpenWorkspaceInGateway && isRunningOnRemoteBackend()) {
return@mapNotNull null
}
Expand Down
Loading