Skip to content

Commit 8019549

Browse files
committed
Fix generate accessor/invoker action. actionPerformedImpl with this signature is no longer always called. Fixes #2480
1 parent 12c8403 commit 8019549

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

src/main/kotlin/platform/mixin/action/GenerateAccessorAction.kt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ package com.demonwav.mcdev.platform.mixin.action
2323
import com.demonwav.mcdev.platform.mixin.MixinModuleType
2424
import com.intellij.codeInsight.FileModificationService
2525
import com.intellij.codeInsight.generation.actions.BaseGenerateAction
26+
import com.intellij.openapi.actionSystem.AnActionEvent
2627
import com.intellij.openapi.application.ApplicationManager
2728
import com.intellij.openapi.command.CommandProcessor
2829
import com.intellij.openapi.editor.Editor
@@ -34,11 +35,21 @@ import com.intellij.psi.PsiJavaFile
3435
import com.intellij.psi.util.PsiUtilBase
3536

3637
class GenerateAccessorAction : BaseGenerateAction(GenerateAccessorHandler()) {
38+
override fun actionPerformed(e: AnActionEvent) {
39+
val project = e.project ?: return
40+
val editor = getEditor(e.dataContext, project, false)
41+
performAction(project, editor)
42+
}
43+
44+
override fun actionPerformedImpl(project: Project, editor: Editor?) {
45+
performAction(project, editor)
46+
}
47+
3748
/**
3849
* Copied from [com.intellij.codeInsight.actions.CodeInsightAction.actionPerformedImpl]
3950
* except that it calls the [GenerateAccessorHandler.customInvoke] method instead of the normal one
4051
*/
41-
override fun actionPerformedImpl(project: Project, editor: Editor?) {
52+
private fun performAction(project: Project, editor: Editor?) {
4253
if (editor == null) {
4354
return
4455
}

0 commit comments

Comments
 (0)