chylex/IntelliJ-Keyboard-Master
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-Keyboard-Master.git synced 2024-10-17 07:42:48 +02:00
Code

Compare commits

base: chylex:381db0e664ff2b9cb83b52070459b2ee7c950728
Branches Tags
chylex:main
..
compare: chylex:215049bf26c79b4381612719f1f2dd7fc036f4c4
Branches Tags
chylex:main

2 Commits
381db0e664 ... 215049bf26

Author SHA1 Message Date
chylex
215049bf26
Release version 0.5.1 2024-05-06 05:41:24 +02:00
chylex
250e8fa8f8
Fix vim-style navigation breaking Enter actions 2024-05-06 05:40:54 +02:00
2 changed files with 10 additions and 13 deletions
Show Stats Expand all files Collapse all files

2
build.gradle.kts
View File

@ -8,7 +8,7 @@ plugins {
} }
group = "com.chylex.intellij.keyboardmaster" group = "com.chylex.intellij.keyboardmaster"
version = "0.5.0" version = "0.5.1"
repositories { repositories {
mavenCentral() mavenCentral()

21
src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/VimNavigationDispatcher.kt
View File

@ -3,15 +3,14 @@ package com.chylex.intellij.keyboardmaster.feature.vimNavigation
import com.chylex.intellij.keyboardmaster.PluginDisposableService import com.chylex.intellij.keyboardmaster.PluginDisposableService
import com.intellij.openapi.actionSystem.ActionUpdateThread import com.intellij.openapi.actionSystem.ActionUpdateThread
import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.actionSystem.CommonDataKeys
import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.project.DumbAwareAction import com.intellij.openapi.project.DumbAwareAction
import com.intellij.pom.Navigatable
import com.intellij.toolWindow.InternalDecoratorImpl import com.intellij.toolWindow.InternalDecoratorImpl
import com.intellij.ui.SpeedSearchBase import com.intellij.ui.SpeedSearchBase
import com.intellij.ui.speedSearch.SpeedSearch import com.intellij.ui.speedSearch.SpeedSearch
import com.intellij.ui.speedSearch.SpeedSearchSupply import com.intellij.ui.speedSearch.SpeedSearchSupply
import java.awt.event.ActionEvent
import java.awt.event.ActionListener
import java.awt.event.KeyEvent import java.awt.event.KeyEvent
import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.atomic.AtomicBoolean
import javax.swing.JComponent import javax.swing.JComponent
@ -22,7 +21,7 @@ internal open class VimNavigationDispatcher<T : JComponent>(final override val c
private val DISPOSABLE = ApplicationManager.getApplication().getService(PluginDisposableService::class.java) private val DISPOSABLE = ApplicationManager.getApplication().getService(PluginDisposableService::class.java)
private val EXTRA_SHORTCUTS = setOf( private val EXTRA_SHORTCUTS = setOf(
KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),
KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0)
) )
@Suppress("UnstableApiUsage") @Suppress("UnstableApiUsage")
@ -31,6 +30,7 @@ internal open class VimNavigationDispatcher<T : JComponent>(final override val c
} }
} }
private val originalEnterAction: ActionListener? = component.getActionForKeyStroke(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0))
private var currentNode: KeyStrokeNode.Parent<VimNavigationDispatcher<T>> = rootNode private var currentNode: KeyStrokeNode.Parent<VimNavigationDispatcher<T>> = rootNode
var isSearching = AtomicBoolean(false) var isSearching = AtomicBoolean(false)
@ -52,7 +52,7 @@ internal open class VimNavigationDispatcher<T : JComponent>(final override val c
final override fun actionPerformed(e: AnActionEvent) { final override fun actionPerformed(e: AnActionEvent) {
val keyEvent = e.inputEvent as? KeyEvent ?: return val keyEvent = e.inputEvent as? KeyEvent ?: return
if (keyEvent.id == KeyEvent.KEY_PRESSED && handleSpecialKeyPress(keyEvent, e.dataContext)) { if (keyEvent.id == KeyEvent.KEY_PRESSED && handleSpecialKeyPress(keyEvent)) {
currentNode = rootNode currentNode = rootNode
return return
} }
@ -66,20 +66,20 @@ internal open class VimNavigationDispatcher<T : JComponent>(final override val c
} }
} }
private fun handleSpecialKeyPress(keyEvent: KeyEvent, dataContext: DataContext): Boolean { private fun handleSpecialKeyPress(keyEvent: KeyEvent): Boolean {
if (keyEvent.keyCode == KeyEvent.VK_ESCAPE) { if (keyEvent.keyCode == KeyEvent.VK_ESCAPE) {
return true return true
} }
if (keyEvent.keyCode == KeyEvent.VK_ENTER) { if (keyEvent.keyCode == KeyEvent.VK_ENTER) {
handleEnterKeyPress(dataContext) handleEnterKeyPress(ActionEvent(component, ActionEvent.ACTION_PERFORMED, "Enter", keyEvent.`when`, keyEvent.modifiersEx))
return true return true
} }
return false return false
} }
private fun handleEnterKeyPress(dataContext: DataContext) { private fun handleEnterKeyPress(e: ActionEvent) {
if (isSearching.compareAndSet(true, false)) { if (isSearching.compareAndSet(true, false)) {
when (val supply = SpeedSearchSupply.getSupply(component)) { when (val supply = SpeedSearchSupply.getSupply(component)) {
is SpeedSearchBase<*> -> supply.hidePopup() is SpeedSearchBase<*> -> supply.hidePopup()
@ -87,10 +87,7 @@ internal open class VimNavigationDispatcher<T : JComponent>(final override val c
} }
} }
else { else {
val navigatables = dataContext.getData(CommonDataKeys.NAVIGATABLE_ARRAY)?.filter(Navigatable::canNavigate).orEmpty() originalEnterAction?.actionPerformed(e)
for ((index, navigatable) in navigatables.withIndex()) {
navigatable.navigate(index == navigatables.lastIndex)
}
} }
} }