File tree Expand file tree Collapse file tree 3 files changed +6
-8
lines changed
plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer Expand file tree Collapse file tree 3 files changed +6
-8
lines changed Original file line number Diff line number Diff line change @@ -11,7 +11,6 @@ import com.intellij.ide.util.treeView.NodeDescriptor
11
11
import com.intellij.ide.util.treeView.NodeRenderer
12
12
import com.intellij.ide.util.treeView.TreeState
13
13
import com.intellij.openapi.Disposable
14
- import com.intellij.openapi.actionSystem.ActionGroup
15
14
import com.intellij.openapi.actionSystem.ActionManager
16
15
import com.intellij.openapi.actionSystem.AnAction
17
16
import com.intellij.openapi.actionSystem.AnActionEvent
@@ -87,10 +86,10 @@ abstract class AbstractExplorerTreeToolWindow(
87
86
if (node is ActionGroupOnRightClick ) {
88
87
val actionGroupName = node.actionGroupName()
89
88
90
- (actionGroupName.let { groupName -> actionManager.getAction(groupName) } as ? ActionGroup )?.let { group ->
89
+ (actionGroupName.let { groupName -> actionManager.getAction(groupName) } as ? DefaultActionGroup )?.let { group ->
91
90
val context = comp?.let { DataManager .getInstance().getDataContext(it, x, y) } ? : return @let
92
91
val event = AnActionEvent .createFromDataContext(actionPlace, null , context)
93
- totalActions.addAll(group.getChildren(event ))
92
+ totalActions.addAll(group.getChildren(actionManager ))
94
93
}
95
94
}
96
95
Original file line number Diff line number Diff line change @@ -10,7 +10,6 @@ import com.intellij.ide.util.treeView.NodeDescriptor
10
10
import com.intellij.ide.util.treeView.NodeRenderer
11
11
import com.intellij.ide.util.treeView.TreeState
12
12
import com.intellij.openapi.Disposable
13
- import com.intellij.openapi.actionSystem.ActionGroup
14
13
import com.intellij.openapi.actionSystem.ActionPlaces
15
14
import com.intellij.openapi.actionSystem.AnAction
16
15
import com.intellij.openapi.actionSystem.AnActionEvent
@@ -313,7 +312,7 @@ class ExplorerToolWindow(private val project: Project) :
313
312
314
313
val totalActions = mutableListOf<AnAction >()
315
314
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 )) }
317
316
318
317
if (explorerNode is AwsExplorerResourceNode <* >) {
319
318
totalActions.add(CopyArnAction ())
Original file line number Diff line number Diff line change @@ -5,8 +5,8 @@ package software.aws.toolkits.jetbrains.core.explorer.devToolsTab.nodes
5
5
6
6
import com.intellij.ide.projectView.PresentationData
7
7
import com.intellij.ide.util.treeView.AbstractTreeNode
8
- import com.intellij.openapi.actionSystem.ActionGroup
9
8
import com.intellij.openapi.actionSystem.ActionManager
9
+ import com.intellij.openapi.actionSystem.DefaultActionGroup
10
10
import com.intellij.openapi.project.Project
11
11
import com.intellij.ui.SimpleTextAttributes
12
12
import software.aws.toolkits.jetbrains.ToolkitPlaces
@@ -28,8 +28,8 @@ class CawsRootNode(private val nodeProject: Project) : AbstractTreeNode<String>(
28
28
is ActiveConnection .ValidBearer -> CAWS_SIGNED_IN_ACTION_GROUP
29
29
else -> CAWS_EXPIRED_TOKEN_ACTION_GROUP
30
30
}
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 {
33
33
if (it is OpenWorkspaceInGateway && isRunningOnRemoteBackend()) {
34
34
return @mapNotNull null
35
35
}
You can’t perform that action at this time.
0 commit comments