Skip to content

Commit b88c0e7

Browse files
committed
refactor: replace deprecated ActionConfigurationCustomizer.customize with CustomizeStrategy
1 parent 8ae6fd0 commit b88c0e7

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
package com.github.lppedd.cc.editor
22

33
import com.intellij.ide.plugins.PluginManager
4-
import com.intellij.openapi.actionSystem.ActionManager
54
import com.intellij.openapi.actionSystem.Constraints
65
import com.intellij.openapi.actionSystem.DefaultActionGroup
6+
import com.intellij.openapi.actionSystem.ex.ActionRuntimeRegistrar
77
import com.intellij.openapi.actionSystem.impl.ActionConfigurationCustomizer
8+
import com.intellij.openapi.actionSystem.impl.ActionConfigurationCustomizer.LightCustomizeStrategy
89
import com.intellij.openapi.extensions.PluginId
910

1011
/**
1112
* @author Edoardo Luppi
1213
*/
1314
@Suppress("UnstableApiUsage")
14-
internal class CommitTabActionConfigurationCustomizer : ActionConfigurationCustomizer {
15+
internal class CommitTabActionConfigurationCustomizer : ActionConfigurationCustomizer, LightCustomizeStrategy {
1516
private val actionId = "EditorTab"
1617
private val groupId = "EditorActions"
1718

18-
@Deprecated("Implement one of [CustomizeStrategy]")
19-
override fun customize(actionManager: ActionManager) {
19+
override suspend fun customize(actionRegistrar: ActionRuntimeRegistrar) {
2020
// Rider register its own EditorTab action, see com.jetbrains.rider.editorActions.FrontendTabAction.
2121
// Unfortunately, that action is coded in Kotlin and marked as final,
2222
// so the only way to avoid breaking Rider is simply to not offer
2323
// enhanced tabbing in the commit dialog
24-
if (!PluginManager.isPluginInstalled(PluginId.getId("com.intellij.modules.rider"))) {
25-
val oldAction = actionManager.getActionOrStub(actionId)
24+
if (PluginManager.isPluginInstalled(PluginId.getId("com.intellij.modules.rider"))) {
25+
return
26+
}
2627

27-
if (oldAction != null) {
28-
val actionGroup = actionManager.getAction(groupId) as DefaultActionGroup
29-
val newAction = CommitTabAction()
30-
actionManager.unregisterAction(actionId)
31-
actionManager.registerAction(actionId, newAction)
28+
val oldAction = actionRegistrar.getActionOrStub(actionId)
3229

33-
// The input ActionManager must be passed in to avoid infinite recursion
34-
actionGroup.addAction(newAction, Constraints.LAST, actionManager)
35-
}
30+
if (oldAction != null) {
31+
val actionGroup = actionRegistrar.getActionOrStub(groupId) as DefaultActionGroup
32+
val newAction = CommitTabAction()
33+
actionRegistrar.unregisterAction(actionId)
34+
actionRegistrar.registerAction(actionId, newAction)
35+
actionRegistrar.addToGroup(actionGroup, newAction, Constraints.LAST)
3636
}
3737
}
3838
}

0 commit comments

Comments
 (0)