Skip to content

Commit 07a8cff

Browse files
committed
Remove deprecated usage
1 parent 67a745d commit 07a8cff

File tree

7 files changed

+23
-20
lines changed

7 files changed

+23
-20
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
.idea
99
.gradle
1010
.intellijPlatform
11+
.kotlin

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ repositories {
1717
}
1818

1919
dependencies {
20-
intellijPlatform { intellijIdeaCommunity("2024.1") }
20+
intellijPlatform { intellijIdeaCommunity("2024.3") }
2121
testImplementation("org.mockito:mockito-core:3.11.2")
2222
testImplementation("org.mockito.kotlin:mockito-kotlin:3.2.0")
2323
testImplementation("nz.lae.stacksrc:stacksrc-junit5:0.5.1")

src/main/kotlin/com/gitlab/lae/intellij/actions/tree/Popup.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.intellij.ide.DataManager
77
import com.intellij.openapi.actionSystem.ActionGroup
88
import com.intellij.openapi.actionSystem.ActionManager
99
import com.intellij.openapi.actionSystem.ActionPlaces.ACTION_PLACE_QUICK_LIST_POPUP_ACTION
10+
import com.intellij.openapi.actionSystem.ActionUiKind
1011
import com.intellij.openapi.actionSystem.AnAction
1112
import com.intellij.openapi.actionSystem.AnActionEvent
1213
import com.intellij.openapi.actionSystem.CommonDataKeys.EDITOR
@@ -129,12 +130,13 @@ internal class Popup(action: ActionNode, e: AnActionEvent) {
129130
private fun performAction(action: AnAction, modifiers: Int, dataContext: DataContext) {
130131
val event =
131132
AnActionEvent(
132-
null,
133133
dataContext,
134-
ACTION_PLACE_QUICK_LIST_POPUP_ACTION,
135134
action.templatePresentation.clone(),
136-
actionManager,
135+
ACTION_PLACE_QUICK_LIST_POPUP_ACTION,
136+
ActionUiKind.POPUP,
137+
null,
137138
modifiers,
139+
actionManager,
138140
)
139141

140142
event.setInjectedContext(action.isInInjectedContext)

src/main/kotlin/com/gitlab/lae/intellij/actions/tree/app/RootAction.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ data class RootAction(
2727
findAction(e)?.actionPerformed(e)
2828
}
2929

30-
override fun beforeActionPerformedUpdate(e: AnActionEvent) {
31-
findAction(e)?.beforeActionPerformedUpdate(e)
32-
}
33-
3430
override fun update(e: AnActionEvent) {
3531
/* It's important to disable this action when none inner action
3632
* is available to execute, so that the keystroke will be passed

src/main/kotlin/com/gitlab/lae/intellij/actions/tree/ui/ActionPresentation.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.gitlab.lae.intellij.actions.tree.ui
33
import com.gitlab.lae.intellij.actions.tree.util.setEnabledModalContext
44
import com.intellij.openapi.actionSystem.ActionManager
55
import com.intellij.openapi.actionSystem.ActionPlaces.ACTION_PLACE_QUICK_LIST_POPUP_ACTION
6+
import com.intellij.openapi.actionSystem.ActionUiKind
67
import com.intellij.openapi.actionSystem.AnAction
78
import com.intellij.openapi.actionSystem.AnActionEvent
89
import com.intellij.openapi.actionSystem.AnActionHolder
@@ -75,12 +76,13 @@ data class ActionPresentation(
7576
fun update(actionManager: ActionManager, dataContext: DataContext) {
7677
val event =
7778
AnActionEvent(
78-
null,
7979
dataContext,
80-
ACTION_PLACE_QUICK_LIST_POPUP_ACTION,
8180
presentation,
82-
actionManager,
81+
ACTION_PLACE_QUICK_LIST_POPUP_ACTION,
82+
ActionUiKind.POPUP,
83+
null,
8384
0,
85+
actionManager,
8486
)
8587
event.setInjectedContext(value.isInInjectedContext)
8688
performDumbAwareUpdate(value, event, false)

src/test/kotlin/com/gitlab/lae/intellij/actions/tree/Actions.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.gitlab.lae.intellij.actions.tree
22

33
import com.gitlab.lae.intellij.actions.tree.When.Always
44
import com.intellij.openapi.actionSystem.ActionManager
5+
import com.intellij.openapi.actionSystem.ActionUiKind
56
import com.intellij.openapi.actionSystem.AnActionEvent
67
import com.intellij.openapi.actionSystem.DataContext
78
import com.intellij.openapi.actionSystem.Presentation
@@ -30,10 +31,11 @@ fun actionEvent(
3031
mask: Int = 0,
3132
) =
3233
AnActionEvent(
33-
input,
3434
context,
35-
place,
3635
presentation,
37-
actionManager,
36+
place,
37+
ActionUiKind.NONE,
38+
input,
3839
mask,
40+
actionManager,
3941
)

src/test/kotlin/com/gitlab/lae/intellij/actions/tree/app/RootActionTest.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ class RootActionTest {
9292

9393
@Test
9494
fun `merges root actions`() {
95-
val cut = EmptyAction("Cut", null, null)
96-
val copy = EmptyAction("Copy", null, null)
97-
val paste = EmptyAction("Paste", null, null)
95+
val cut = EmptyAction()
96+
val copy = EmptyAction()
97+
val paste = EmptyAction()
9898

9999
val actionManager = mock<ActionManager>()
100100
whenever(actionManager.getAction(ACTION_CUT)).thenReturn(cut)
@@ -140,9 +140,9 @@ class RootActionTest {
140140

141141
@Test
142142
fun `merging maintains action with no key strokes`() {
143-
val cut = EmptyAction("Cut", null, null)
144-
val copy = EmptyAction("Copy", null, null)
145-
val paste = EmptyAction("Paste", null, null)
143+
val cut = EmptyAction()
144+
val copy = EmptyAction()
145+
val paste = EmptyAction()
146146
val actionManager = mock<ActionManager>()
147147
whenever(actionManager.getAction(ACTION_CUT)).thenReturn(cut)
148148
whenever(actionManager.getAction(ACTION_COPY)).thenReturn(copy)

0 commit comments

Comments
 (0)