mirror of
https://github.com/chylex/IntelliJ-Keyboard-Master.git
synced 2024-11-25 01:42:47 +01:00
Compare commits
3 Commits
95fca176ba
...
af04cc2bbe
Author | SHA1 | Date | |
---|---|---|---|
af04cc2bbe | |||
b83ccfb240 | |||
7774159324 |
@ -0,0 +1,9 @@
|
|||||||
|
package com.chylex.intellij.keyboardmaster
|
||||||
|
|
||||||
|
import com.intellij.openapi.Disposable
|
||||||
|
import com.intellij.openapi.components.Service
|
||||||
|
|
||||||
|
@Service
|
||||||
|
internal class PluginDisposableService : Disposable {
|
||||||
|
override fun dispose() {}
|
||||||
|
}
|
@ -1,6 +1,8 @@
|
|||||||
package com.chylex.intellij.keyboardmaster
|
package com.chylex.intellij.keyboardmaster
|
||||||
|
|
||||||
|
import com.chylex.intellij.keyboardmaster.configuration.PluginConfiguration
|
||||||
import com.chylex.intellij.keyboardmaster.feature.codeCompletion.CodeCompletionPopupKeyHandler
|
import com.chylex.intellij.keyboardmaster.feature.codeCompletion.CodeCompletionPopupKeyHandler
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.VimNavigation
|
||||||
import com.intellij.openapi.application.ApplicationManager
|
import com.intellij.openapi.application.ApplicationManager
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.openapi.startup.ProjectActivity
|
import com.intellij.openapi.startup.ProjectActivity
|
||||||
@ -12,13 +14,20 @@ class PluginStartup : ProjectActivity {
|
|||||||
if (!isInitialized) {
|
if (!isInitialized) {
|
||||||
isInitialized = true
|
isInitialized = true
|
||||||
|
|
||||||
|
PluginConfiguration.load()
|
||||||
|
|
||||||
val application = ApplicationManager.getApplication()
|
val application = ApplicationManager.getApplication()
|
||||||
if (application.isUnitTestMode) {
|
if (application.isUnitTestMode) {
|
||||||
CodeCompletionPopupKeyHandler.registerRawHandler()
|
initialize()
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
application.invokeLater(CodeCompletionPopupKeyHandler.Companion::registerRawHandler)
|
application.invokeLater(::initialize)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun initialize() {
|
||||||
|
CodeCompletionPopupKeyHandler.registerRawHandler()
|
||||||
|
VimNavigation.register()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
package com.chylex.intellij.keyboardmaster.configuration
|
package com.chylex.intellij.keyboardmaster.configuration
|
||||||
|
|
||||||
import com.intellij.openapi.options.Configurable
|
import com.intellij.openapi.options.Configurable
|
||||||
|
import com.intellij.openapi.ui.Messages
|
||||||
|
import com.intellij.ui.components.JBCheckBox
|
||||||
import com.intellij.ui.components.JBTextField
|
import com.intellij.ui.components.JBTextField
|
||||||
import com.intellij.ui.dsl.builder.panel
|
import com.intellij.ui.dsl.builder.panel
|
||||||
import javax.swing.JComponent
|
import javax.swing.JComponent
|
||||||
@ -12,6 +14,14 @@ class PluginConfigurable : Configurable {
|
|||||||
private val codeCompletionNextPageShortcut = JBTextField(2)
|
private val codeCompletionNextPageShortcut = JBTextField(2)
|
||||||
private val codeCompletionPrevPageShortcut = JBTextField(2)
|
private val codeCompletionPrevPageShortcut = JBTextField(2)
|
||||||
|
|
||||||
|
private val enableVimNavigation = JBCheckBox("Vim-style navigation in lists / trees / tables").also { checkBox ->
|
||||||
|
checkBox.addActionListener {
|
||||||
|
if (!checkBox.isSelected) {
|
||||||
|
Messages.showInfoMessage(checkBox, "Vim-style navigation will be disabled after restarting the IDE.", "Keyboard Master")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
override fun getDisplayName(): String {
|
override fun getDisplayName(): String {
|
||||||
return "Keyboard Master"
|
return "Keyboard Master"
|
||||||
}
|
}
|
||||||
@ -23,6 +33,10 @@ class PluginConfigurable : Configurable {
|
|||||||
row("Next page shortcut:") { cell(codeCompletionNextPageShortcut) }
|
row("Next page shortcut:") { cell(codeCompletionNextPageShortcut) }
|
||||||
row("Prev page shortcut:") { cell(codeCompletionPrevPageShortcut) }
|
row("Prev page shortcut:") { cell(codeCompletionPrevPageShortcut) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
group("Navigation") {
|
||||||
|
row { cell(enableVimNavigation) }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return component
|
return component
|
||||||
@ -37,6 +51,8 @@ class PluginConfigurable : Configurable {
|
|||||||
it.codeCompletionItemShortcuts = codeCompletionItemShortcuts.text
|
it.codeCompletionItemShortcuts = codeCompletionItemShortcuts.text
|
||||||
it.codeCompletionNextPageShortcut = codeCompletionNextPageShortcut.text.firstOrNull()?.code ?: 0
|
it.codeCompletionNextPageShortcut = codeCompletionNextPageShortcut.text.firstOrNull()?.code ?: 0
|
||||||
it.codeCompletionPrevPageShortcut = codeCompletionPrevPageShortcut.text.firstOrNull()?.code ?: 0
|
it.codeCompletionPrevPageShortcut = codeCompletionPrevPageShortcut.text.firstOrNull()?.code ?: 0
|
||||||
|
|
||||||
|
it.enableVimNavigation = enableVimNavigation.isSelected
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -45,6 +61,8 @@ class PluginConfigurable : Configurable {
|
|||||||
codeCompletionItemShortcuts.text = it.codeCompletionItemShortcuts
|
codeCompletionItemShortcuts.text = it.codeCompletionItemShortcuts
|
||||||
codeCompletionNextPageShortcut.text = it.codeCompletionNextPageShortcut.let { code -> if (code == 0) "" else code.toChar().toString() }
|
codeCompletionNextPageShortcut.text = it.codeCompletionNextPageShortcut.let { code -> if (code == 0) "" else code.toChar().toString() }
|
||||||
codeCompletionPrevPageShortcut.text = it.codeCompletionPrevPageShortcut.let { code -> if (code == 0) "" else code.toChar().toString() }
|
codeCompletionPrevPageShortcut.text = it.codeCompletionPrevPageShortcut.let { code -> if (code == 0) "" else code.toChar().toString() }
|
||||||
|
|
||||||
|
enableVimNavigation.isSelected = it.enableVimNavigation
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package com.chylex.intellij.keyboardmaster.configuration
|
package com.chylex.intellij.keyboardmaster.configuration
|
||||||
|
|
||||||
import com.chylex.intellij.keyboardmaster.feature.codeCompletion.CodeCompletionPopupConfiguration
|
import com.chylex.intellij.keyboardmaster.feature.codeCompletion.CodeCompletionPopupConfiguration
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.VimNavigation
|
||||||
import com.intellij.openapi.application.ApplicationManager
|
import com.intellij.openapi.application.ApplicationManager
|
||||||
import com.intellij.openapi.components.PersistentStateComponent
|
import com.intellij.openapi.components.PersistentStateComponent
|
||||||
import com.intellij.openapi.components.State
|
import com.intellij.openapi.components.State
|
||||||
@ -16,6 +17,8 @@ class PluginConfiguration : PersistentStateComponent<PluginConfiguration> {
|
|||||||
var codeCompletionNextPageShortcut: Int = '0'.code
|
var codeCompletionNextPageShortcut: Int = '0'.code
|
||||||
var codeCompletionPrevPageShortcut: Int = 0
|
var codeCompletionPrevPageShortcut: Int = 0
|
||||||
|
|
||||||
|
var enableVimNavigation = false
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private val instance: PluginConfiguration
|
private val instance: PluginConfiguration
|
||||||
get() = ApplicationManager.getApplication().getService(PluginConfiguration::class.java)
|
get() = ApplicationManager.getApplication().getService(PluginConfiguration::class.java)
|
||||||
@ -34,6 +37,7 @@ class PluginConfiguration : PersistentStateComponent<PluginConfiguration> {
|
|||||||
|
|
||||||
private fun update(instance: PluginConfiguration) = with(instance) {
|
private fun update(instance: PluginConfiguration) = with(instance) {
|
||||||
CodeCompletionPopupConfiguration.updateShortcuts(codeCompletionItemShortcuts, codeCompletionNextPageShortcut, codeCompletionPrevPageShortcut)
|
CodeCompletionPopupConfiguration.updateShortcuts(codeCompletionItemShortcuts, codeCompletionNextPageShortcut, codeCompletionPrevPageShortcut)
|
||||||
|
VimNavigation.setEnabled(enableVimNavigation)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
package com.chylex.intellij.keyboardmaster.feature.codeCompletion
|
package com.chylex.intellij.keyboardmaster.feature.codeCompletion
|
||||||
|
|
||||||
import com.chylex.intellij.keyboardmaster.configuration.PluginConfiguration
|
|
||||||
import com.intellij.util.containers.IntIntHashMap
|
import com.intellij.util.containers.IntIntHashMap
|
||||||
|
|
||||||
object CodeCompletionPopupConfiguration {
|
object CodeCompletionPopupConfiguration {
|
||||||
@ -14,10 +13,6 @@ object CodeCompletionPopupConfiguration {
|
|||||||
val itemShortcutCount
|
val itemShortcutCount
|
||||||
get() = hintTexts.size
|
get() = hintTexts.size
|
||||||
|
|
||||||
init {
|
|
||||||
PluginConfiguration.load()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun updateShortcuts(itemShortcutChars: String, nextPageShortcutCode: Int, previousPageShortcutCode: Int) {
|
fun updateShortcuts(itemShortcutChars: String, nextPageShortcutCode: Int, previousPageShortcutCode: Int) {
|
||||||
charToShortcutMap.clear()
|
charToShortcutMap.clear()
|
||||||
|
|
||||||
|
@ -0,0 +1,11 @@
|
|||||||
|
package com.chylex.intellij.keyboardmaster.feature.vimNavigation
|
||||||
|
|
||||||
|
import com.intellij.ui.popup.WizardPopup
|
||||||
|
import javax.swing.JComponent
|
||||||
|
|
||||||
|
internal interface ComponentHolder {
|
||||||
|
val component: JComponent
|
||||||
|
|
||||||
|
val popup: WizardPopup?
|
||||||
|
get() = null
|
||||||
|
}
|
@ -0,0 +1,84 @@
|
|||||||
|
package com.chylex.intellij.keyboardmaster.feature.vimNavigation
|
||||||
|
|
||||||
|
import com.intellij.openapi.actionSystem.AnActionEvent
|
||||||
|
import com.intellij.openapi.actionSystem.CustomShortcutSet
|
||||||
|
import com.intellij.openapi.actionSystem.CustomizedDataContext
|
||||||
|
import com.intellij.openapi.actionSystem.KeyboardShortcut
|
||||||
|
import com.intellij.openapi.actionSystem.PlatformDataKeys
|
||||||
|
import com.intellij.openapi.actionSystem.ex.ActionUtil
|
||||||
|
import com.intellij.util.containers.map2Array
|
||||||
|
import java.awt.event.KeyEvent
|
||||||
|
import javax.swing.KeyStroke
|
||||||
|
|
||||||
|
internal interface KeyStrokeNode<T> {
|
||||||
|
class Parent<T>(private val keys: Map<KeyStroke, KeyStrokeNode<T>>) : KeyStrokeNode<T> {
|
||||||
|
val allKeyStrokes: Set<KeyStroke> = mutableSetOf<KeyStroke>().apply {
|
||||||
|
for ((key, node) in keys) {
|
||||||
|
add(key)
|
||||||
|
|
||||||
|
if (node is Parent) {
|
||||||
|
node.collectKeys(this)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getChild(keyEvent: KeyEvent): KeyStrokeNode<T> {
|
||||||
|
val keyStroke = when {
|
||||||
|
keyEvent.keyChar != KeyEvent.CHAR_UNDEFINED -> KeyStroke.getKeyStroke(keyEvent.keyChar, keyEvent.modifiersEx and KeyEvent.SHIFT_DOWN_MASK.inv())
|
||||||
|
keyEvent.id == KeyEvent.KEY_PRESSED -> KeyStroke.getKeyStroke(keyEvent.keyCode, keyEvent.modifiersEx, false)
|
||||||
|
else -> return this
|
||||||
|
}
|
||||||
|
|
||||||
|
return keys[keyStroke] ?: this
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun collectKeys(target: MutableSet<KeyStroke>) {
|
||||||
|
for ((key, node) in keys) {
|
||||||
|
target.add(key)
|
||||||
|
|
||||||
|
if (node is Parent) {
|
||||||
|
node.collectKeys(target)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ActionNode<T> : KeyStrokeNode<T> {
|
||||||
|
fun performAction(holder: T, actionEvent: AnActionEvent, keyEvent: KeyEvent)
|
||||||
|
}
|
||||||
|
|
||||||
|
class IdeaAction<T : ComponentHolder>(private val name: String) : ActionNode<T> {
|
||||||
|
override fun performAction(holder: T, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
|
||||||
|
val action = actionEvent.actionManager.getAction(name) ?: return
|
||||||
|
|
||||||
|
val dataContext = CustomizedDataContext.create(actionEvent.dataContext) {
|
||||||
|
when {
|
||||||
|
PlatformDataKeys.CONTEXT_COMPONENT.`is`(it) -> holder.component
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ActionUtil.invokeAction(action, dataContext, actionEvent.place, null, null)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
fun <T> getAllKeyStrokes(root: Parent<T>, extra: Set<KeyStroke>? = null): Set<KeyStroke> {
|
||||||
|
val allKeyStrokes = HashSet(root.allKeyStrokes)
|
||||||
|
|
||||||
|
if (extra != null) {
|
||||||
|
allKeyStrokes.addAll(extra)
|
||||||
|
}
|
||||||
|
|
||||||
|
for (c in ('a'..'z') + ('A'..'Z')) {
|
||||||
|
allKeyStrokes.add(KeyStroke.getKeyStroke(c))
|
||||||
|
}
|
||||||
|
|
||||||
|
return allKeyStrokes
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getAllShortcuts(keyStrokes: Set<KeyStroke>): CustomShortcutSet {
|
||||||
|
return CustomShortcutSet(*keyStrokes.map2Array { KeyboardShortcut(it, null) })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,19 @@
|
|||||||
|
package com.chylex.intellij.keyboardmaster.feature.vimNavigation
|
||||||
|
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.components.VimListNavigation
|
||||||
|
import com.intellij.ui.UiInterceptors.PersistentUiInterceptor
|
||||||
|
import com.intellij.ui.awt.RelativePoint
|
||||||
|
import com.intellij.ui.popup.AbstractPopup
|
||||||
|
import com.intellij.ui.popup.list.ListPopupImpl
|
||||||
|
|
||||||
|
internal object PopupInterceptor : PersistentUiInterceptor<AbstractPopup>(AbstractPopup::class.java) {
|
||||||
|
override fun shouldIntercept(component: AbstractPopup): Boolean {
|
||||||
|
if (component is ListPopupImpl) {
|
||||||
|
VimListNavigation.install(component.list, component)
|
||||||
|
}
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun doIntercept(component: AbstractPopup, owner: RelativePoint?) {}
|
||||||
|
}
|
@ -0,0 +1,70 @@
|
|||||||
|
package com.chylex.intellij.keyboardmaster.feature.vimNavigation
|
||||||
|
|
||||||
|
import com.chylex.intellij.keyboardmaster.PluginDisposableService
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.components.VimListNavigation
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.components.VimTableNavigation
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.components.VimTreeNavigation
|
||||||
|
import com.intellij.openapi.application.ApplicationManager
|
||||||
|
import com.intellij.ui.UiInterceptors
|
||||||
|
import com.intellij.util.ui.StartupUiUtil
|
||||||
|
import java.awt.AWTEvent
|
||||||
|
import java.awt.event.FocusEvent
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean
|
||||||
|
import javax.swing.JList
|
||||||
|
import javax.swing.JTable
|
||||||
|
import javax.swing.JTree
|
||||||
|
import javax.swing.KeyStroke
|
||||||
|
import javax.swing.UIManager
|
||||||
|
|
||||||
|
object VimNavigation {
|
||||||
|
private val isEnabled = AtomicBoolean(false)
|
||||||
|
private var originalPopupBindings: Array<*>? = null
|
||||||
|
|
||||||
|
fun register() {
|
||||||
|
val disposable = ApplicationManager.getApplication().getService(PluginDisposableService::class.java)
|
||||||
|
|
||||||
|
StartupUiUtil.addAwtListener(::handleEvent, AWTEvent.FOCUS_EVENT_MASK, disposable)
|
||||||
|
UiInterceptors.registerPersistent(disposable, PopupInterceptor)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun setEnabled(enabled: Boolean) {
|
||||||
|
if (!isEnabled.compareAndSet(!enabled, enabled)) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (enabled) {
|
||||||
|
val originalBindings = (UIManager.get("PopupMenu.selectedWindowInputMapBindings") as Array<*>).also { originalPopupBindings = it }
|
||||||
|
val updatedBindings = mutableListOf(*originalBindings)
|
||||||
|
|
||||||
|
updatedBindings.add(KeyStroke.getKeyStroke('h'))
|
||||||
|
updatedBindings.add("selectParent")
|
||||||
|
|
||||||
|
updatedBindings.add(KeyStroke.getKeyStroke('j'))
|
||||||
|
updatedBindings.add("selectNext")
|
||||||
|
|
||||||
|
updatedBindings.add(KeyStroke.getKeyStroke('k'))
|
||||||
|
updatedBindings.add("selectPrevious")
|
||||||
|
|
||||||
|
updatedBindings.add(KeyStroke.getKeyStroke('l'))
|
||||||
|
updatedBindings.add("selectChild")
|
||||||
|
|
||||||
|
updatedBindings.add(KeyStroke.getKeyStroke('q'))
|
||||||
|
updatedBindings.add("cancel")
|
||||||
|
|
||||||
|
UIManager.put("PopupMenu.selectedWindowInputMapBindings", updatedBindings.toTypedArray())
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
UIManager.put("PopupMenu.selectedWindowInputMapBindings", originalPopupBindings)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun handleEvent(event: AWTEvent) {
|
||||||
|
if (event is FocusEvent && event.id == FocusEvent.FOCUS_GAINED && isEnabled.get()) {
|
||||||
|
when (val source = event.source) {
|
||||||
|
is JList<*> -> VimListNavigation.install(source)
|
||||||
|
is JTree -> VimTreeNavigation.install(source)
|
||||||
|
is JTable -> VimTableNavigation.install(source)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,127 @@
|
|||||||
|
package com.chylex.intellij.keyboardmaster.feature.vimNavigation
|
||||||
|
|
||||||
|
import com.chylex.intellij.keyboardmaster.PluginDisposableService
|
||||||
|
import com.intellij.openapi.actionSystem.ActionUpdateThread
|
||||||
|
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.project.DumbAwareAction
|
||||||
|
import com.intellij.openapi.wm.ex.ToolWindowManagerEx
|
||||||
|
import com.intellij.pom.Navigatable
|
||||||
|
import com.intellij.toolWindow.InternalDecoratorImpl
|
||||||
|
import com.intellij.ui.SpeedSearchBase
|
||||||
|
import com.intellij.ui.speedSearch.SpeedSearch
|
||||||
|
import com.intellij.ui.speedSearch.SpeedSearchActivator
|
||||||
|
import com.intellij.ui.speedSearch.SpeedSearchSupply
|
||||||
|
import java.awt.event.KeyEvent
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean
|
||||||
|
import javax.swing.JComponent
|
||||||
|
import javax.swing.KeyStroke
|
||||||
|
|
||||||
|
internal open class VimNavigationDispatcher<T : JComponent>(final override val component: T, private val rootNode: KeyStrokeNode.Parent<VimNavigationDispatcher<T>>) : DumbAwareAction(), ComponentHolder {
|
||||||
|
private companion object {
|
||||||
|
private val DISPOSABLE = ApplicationManager.getApplication().getService(PluginDisposableService::class.java)
|
||||||
|
private val EXTRA_SHORTCUTS = setOf(
|
||||||
|
KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),
|
||||||
|
KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
private var currentNode: KeyStrokeNode.Parent<VimNavigationDispatcher<T>> = rootNode
|
||||||
|
var isSearching = AtomicBoolean(false)
|
||||||
|
|
||||||
|
init {
|
||||||
|
registerCustomShortcutSet(KeyStrokeNode.getAllShortcuts(getAllKeyStrokes()), component, DISPOSABLE)
|
||||||
|
|
||||||
|
val speedSearch = SpeedSearchSupply.getSupply(component, true)
|
||||||
|
speedSearch?.addChangeListener {
|
||||||
|
if (it.propertyName == SpeedSearchSupply.ENTERED_PREFIX_PROPERTY_NAME && !speedSearch.isPopupActive) {
|
||||||
|
isSearching.set(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected fun getAllKeyStrokes(): Set<KeyStroke> {
|
||||||
|
return KeyStrokeNode.getAllKeyStrokes(rootNode, EXTRA_SHORTCUTS)
|
||||||
|
}
|
||||||
|
|
||||||
|
final override fun actionPerformed(e: AnActionEvent) {
|
||||||
|
val keyEvent = e.inputEvent as? KeyEvent ?: return
|
||||||
|
|
||||||
|
if (keyEvent.id == KeyEvent.KEY_PRESSED && handleSpecialKeyPress(keyEvent, e.dataContext)) {
|
||||||
|
currentNode = rootNode
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
when (val nextNode = currentNode.getChild(keyEvent)) {
|
||||||
|
is KeyStrokeNode.Parent<VimNavigationDispatcher<T>> -> currentNode = nextNode
|
||||||
|
is KeyStrokeNode.ActionNode<VimNavigationDispatcher<T>> -> {
|
||||||
|
nextNode.performAction(this, e, keyEvent)
|
||||||
|
currentNode = rootNode
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun handleSpecialKeyPress(keyEvent: KeyEvent, dataContext: DataContext): Boolean {
|
||||||
|
if (keyEvent.keyCode == KeyEvent.VK_ESCAPE) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
if (keyEvent.keyCode == KeyEvent.VK_ENTER) {
|
||||||
|
handleEnterKeyPress(dataContext)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun handleEnterKeyPress(dataContext: DataContext) {
|
||||||
|
if (isSearching.compareAndSet(true, false)) {
|
||||||
|
when (val supply = SpeedSearchSupply.getSupply(component)) {
|
||||||
|
is SpeedSearchBase<*> -> supply.hidePopup()
|
||||||
|
is SpeedSearch -> supply.reset()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
val navigatables = dataContext.getData(CommonDataKeys.NAVIGATABLE_ARRAY)?.filter(Navigatable::canNavigate).orEmpty()
|
||||||
|
for ((index, navigatable) in navigatables.withIndex()) {
|
||||||
|
navigatable.navigate(index == navigatables.lastIndex)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final override fun update(e: AnActionEvent) {
|
||||||
|
e.presentation.isEnabled = !isSearching.get() || e.inputEvent.let { it is KeyEvent && it.id == KeyEvent.KEY_PRESSED && it.keyCode == KeyEvent.VK_ENTER }
|
||||||
|
}
|
||||||
|
|
||||||
|
final override fun getActionUpdateThread(): ActionUpdateThread {
|
||||||
|
return ActionUpdateThread.BGT
|
||||||
|
}
|
||||||
|
|
||||||
|
class StartSearch<T : JComponent> : KeyStrokeNode.ActionNode<VimNavigationDispatcher<T>> {
|
||||||
|
@Suppress("UnstableApiUsage")
|
||||||
|
override fun performAction(holder: VimNavigationDispatcher<T>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
|
||||||
|
val speedSearch = SpeedSearchSupply.getSupply(holder.component, true) as? SpeedSearchActivator ?: return
|
||||||
|
if (speedSearch.isAvailable) {
|
||||||
|
holder.isSearching.set(true)
|
||||||
|
speedSearch.activate()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Suppress("UnstableApiUsage")
|
||||||
|
class CloseParentPopupOrToolWindow<T : JComponent> : KeyStrokeNode.ActionNode<VimNavigationDispatcher<T>> {
|
||||||
|
override fun performAction(holder: VimNavigationDispatcher<T>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
|
||||||
|
val popup = holder.popup
|
||||||
|
if (popup != null) {
|
||||||
|
popup.cancel()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val project = actionEvent.project ?: return
|
||||||
|
val decorator = InternalDecoratorImpl.findNearestDecorator(holder.component) ?: return
|
||||||
|
ToolWindowManagerEx.getInstanceEx(project).hideToolWindow(decorator.toolWindowId, true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,94 @@
|
|||||||
|
package com.chylex.intellij.keyboardmaster.feature.vimNavigation.components
|
||||||
|
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.KeyStrokeNode.IdeaAction
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.KeyStrokeNode.Parent
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.VimNavigationDispatcher
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.VimNavigationDispatcher.CloseParentPopupOrToolWindow
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.VimNavigationDispatcher.StartSearch
|
||||||
|
import com.intellij.openapi.application.ApplicationManager
|
||||||
|
import com.intellij.openapi.ui.getUserData
|
||||||
|
import com.intellij.openapi.ui.putUserData
|
||||||
|
import com.intellij.openapi.util.Key
|
||||||
|
import com.intellij.ui.popup.WizardPopup
|
||||||
|
import com.intellij.ui.speedSearch.SpeedSearch
|
||||||
|
import com.intellij.ui.speedSearch.SpeedSearchSupply
|
||||||
|
import java.awt.event.ActionEvent
|
||||||
|
import java.awt.event.KeyEvent
|
||||||
|
import javax.swing.AbstractAction
|
||||||
|
import javax.swing.JList
|
||||||
|
import javax.swing.KeyStroke
|
||||||
|
|
||||||
|
internal object VimListNavigation {
|
||||||
|
private val KEY = Key.create<VimNavigationDispatcher<JList<*>>>("KeyboardMaster-VimListNavigation")
|
||||||
|
|
||||||
|
private val ROOT_NODE = Parent<VimNavigationDispatcher<JList<*>>>(
|
||||||
|
mapOf(
|
||||||
|
KeyStroke.getKeyStroke('A') to IdeaAction("MaximizeToolWindow"),
|
||||||
|
KeyStroke.getKeyStroke('f') to StartSearch(),
|
||||||
|
KeyStroke.getKeyStroke('g') to Parent(
|
||||||
|
mapOf(
|
||||||
|
KeyStroke.getKeyStroke('g') to IdeaAction("List-selectFirstRow"),
|
||||||
|
)
|
||||||
|
),
|
||||||
|
KeyStroke.getKeyStroke('G') to IdeaAction("List-selectLastRow"),
|
||||||
|
KeyStroke.getKeyStroke('h') to IdeaAction("List-selectPreviousColumn"),
|
||||||
|
KeyStroke.getKeyStroke('j') to IdeaAction("List-selectNextRow"),
|
||||||
|
KeyStroke.getKeyStroke('k') to IdeaAction("List-selectPreviousRow"),
|
||||||
|
KeyStroke.getKeyStroke('l') to IdeaAction("List-selectNextColumn"),
|
||||||
|
KeyStroke.getKeyStroke('m') to IdeaAction("ShowPopupMenu"),
|
||||||
|
KeyStroke.getKeyStroke('q') to CloseParentPopupOrToolWindow(),
|
||||||
|
KeyStroke.getKeyStroke('/') to StartSearch(),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
fun install(component: JList<*>) {
|
||||||
|
if (component.getUserData(KEY) == null && component.javaClass.enclosingClass.let { it == null || !WizardPopup::class.java.isAssignableFrom(it) }) {
|
||||||
|
component.putUserData(KEY, VimNavigationDispatcher(component, ROOT_NODE))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun install(component: JList<*>, popup: WizardPopup) {
|
||||||
|
if (component.getUserData(KEY) == null) {
|
||||||
|
component.putUserData(KEY, VimPopupListNavigationDispatcher(component, popup))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Suppress("serial")
|
||||||
|
private class VimPopupListNavigationDispatcher(component: JList<*>, override val popup: WizardPopup) : VimNavigationDispatcher<JList<*>>(component, ROOT_NODE) {
|
||||||
|
init {
|
||||||
|
val speedSearch = SpeedSearchSupply.getSupply(component, true) as? SpeedSearch
|
||||||
|
if (speedSearch != null) {
|
||||||
|
installSpeedSearch(speedSearch, popup)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun installSpeedSearch(speedSearch: SpeedSearch, popup: WizardPopup) {
|
||||||
|
val pauseAction = PauseSpeedSearchAction(this, speedSearch)
|
||||||
|
|
||||||
|
for (keyStroke in getAllKeyStrokes()) {
|
||||||
|
if (keyStroke.keyEventType != KeyEvent.KEY_TYPED) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
val keyCode = KeyEvent.getExtendedKeyCodeForChar(keyStroke.keyChar.code)
|
||||||
|
if (keyCode != KeyEvent.VK_UNDEFINED) {
|
||||||
|
popup.registerAction("KeyboardMaster-VimListNavigation-PauseSpeedSearch", KeyStroke.getKeyStroke(keyCode, 0), pauseAction)
|
||||||
|
popup.registerAction("KeyboardMaster-VimListNavigation-PauseSpeedSearch", KeyStroke.getKeyStroke(keyCode, KeyEvent.SHIFT_DOWN_MASK), pauseAction)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// WizardPopup only checks key codes against its input map, but key codes may be undefined for some characters.
|
||||||
|
popup.registerAction("KeyboardMaster-VimListNavigation-PauseSpeedSearch", KeyStroke.getKeyStroke(KeyEvent.CHAR_UNDEFINED, 0), pauseAction)
|
||||||
|
popup.registerAction("KeyboardMaster-VimListNavigation-PauseSpeedSearch", KeyStroke.getKeyStroke(KeyEvent.CHAR_UNDEFINED, KeyEvent.SHIFT_DOWN_MASK), pauseAction)
|
||||||
|
}
|
||||||
|
|
||||||
|
private class PauseSpeedSearchAction(private val dispatcher: VimNavigationDispatcher<JList<*>>, private val speedSearch: SpeedSearch) : AbstractAction() {
|
||||||
|
override fun actionPerformed(e: ActionEvent) {
|
||||||
|
if (!dispatcher.isSearching.get()) {
|
||||||
|
speedSearch.setEnabled(false)
|
||||||
|
ApplicationManager.getApplication().invokeLater { speedSearch.setEnabled(true) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,42 @@
|
|||||||
|
package com.chylex.intellij.keyboardmaster.feature.vimNavigation.components
|
||||||
|
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.KeyStrokeNode.IdeaAction
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.KeyStrokeNode.Parent
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.VimNavigationDispatcher
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.VimNavigationDispatcher.CloseParentPopupOrToolWindow
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.VimNavigationDispatcher.StartSearch
|
||||||
|
import com.intellij.openapi.ui.getUserData
|
||||||
|
import com.intellij.openapi.ui.putUserData
|
||||||
|
import com.intellij.openapi.util.Key
|
||||||
|
import javax.swing.JTable
|
||||||
|
import javax.swing.KeyStroke
|
||||||
|
|
||||||
|
internal object VimTableNavigation {
|
||||||
|
private val KEY = Key.create<VimNavigationDispatcher<JTable>>("KeyboardMaster-VimTableNavigation")
|
||||||
|
|
||||||
|
private val ROOT_NODE = Parent<VimNavigationDispatcher<JTable>>(
|
||||||
|
mapOf(
|
||||||
|
KeyStroke.getKeyStroke('A') to IdeaAction("MaximizeToolWindow"),
|
||||||
|
KeyStroke.getKeyStroke('f') to StartSearch(),
|
||||||
|
KeyStroke.getKeyStroke('g') to Parent(
|
||||||
|
mapOf(
|
||||||
|
KeyStroke.getKeyStroke('g') to IdeaAction("Table-selectFirstRow"),
|
||||||
|
)
|
||||||
|
),
|
||||||
|
KeyStroke.getKeyStroke('G') to IdeaAction("Table-selectLastRow"),
|
||||||
|
KeyStroke.getKeyStroke('h') to IdeaAction("Table-selectPreviousColumn"),
|
||||||
|
KeyStroke.getKeyStroke('j') to IdeaAction("Table-selectNextRow"),
|
||||||
|
KeyStroke.getKeyStroke('k') to IdeaAction("Table-selectPreviousRow"),
|
||||||
|
KeyStroke.getKeyStroke('l') to IdeaAction("Table-selectNextColumn"),
|
||||||
|
KeyStroke.getKeyStroke('m') to IdeaAction("ShowPopupMenu"),
|
||||||
|
KeyStroke.getKeyStroke('q') to CloseParentPopupOrToolWindow(),
|
||||||
|
KeyStroke.getKeyStroke('/') to StartSearch(),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
fun install(component: JTable) {
|
||||||
|
if (component.getUserData(KEY) == null) {
|
||||||
|
component.putUserData(KEY, VimNavigationDispatcher(component, ROOT_NODE))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,121 @@
|
|||||||
|
package com.chylex.intellij.keyboardmaster.feature.vimNavigation.components
|
||||||
|
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.KeyStrokeNode.ActionNode
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.KeyStrokeNode.IdeaAction
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.KeyStrokeNode.Parent
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.VimNavigationDispatcher
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.VimNavigationDispatcher.CloseParentPopupOrToolWindow
|
||||||
|
import com.chylex.intellij.keyboardmaster.feature.vimNavigation.VimNavigationDispatcher.StartSearch
|
||||||
|
import com.intellij.openapi.actionSystem.AnActionEvent
|
||||||
|
import com.intellij.openapi.ui.getUserData
|
||||||
|
import com.intellij.openapi.ui.putUserData
|
||||||
|
import com.intellij.openapi.util.Key
|
||||||
|
import java.awt.event.KeyEvent
|
||||||
|
import javax.swing.JTree
|
||||||
|
import javax.swing.KeyStroke
|
||||||
|
|
||||||
|
internal object VimTreeNavigation {
|
||||||
|
private val KEY = Key.create<VimNavigationDispatcher<JTree>>("KeyboardMaster-VimTreeNavigation")
|
||||||
|
|
||||||
|
private val ROOT_NODE = Parent(
|
||||||
|
mapOf(
|
||||||
|
KeyStroke.getKeyStroke('A') to IdeaAction("MaximizeToolWindow"),
|
||||||
|
KeyStroke.getKeyStroke('f') to StartSearch(),
|
||||||
|
KeyStroke.getKeyStroke('g') to Parent(
|
||||||
|
mapOf(
|
||||||
|
KeyStroke.getKeyStroke('g') to IdeaAction("Tree-selectFirst"),
|
||||||
|
)
|
||||||
|
),
|
||||||
|
KeyStroke.getKeyStroke('G') to IdeaAction("Tree-selectLast"),
|
||||||
|
KeyStroke.getKeyStroke('j') to IdeaAction("Tree-selectNext"),
|
||||||
|
KeyStroke.getKeyStroke('j', KeyEvent.ALT_DOWN_MASK) to IdeaAction("Tree-selectNextSibling"),
|
||||||
|
KeyStroke.getKeyStroke('J') to SelectLastSibling,
|
||||||
|
KeyStroke.getKeyStroke('k') to IdeaAction("Tree-selectPrevious"),
|
||||||
|
KeyStroke.getKeyStroke('k', KeyEvent.ALT_DOWN_MASK) to IdeaAction("Tree-selectPreviousSibling"),
|
||||||
|
KeyStroke.getKeyStroke('K') to SelectFirstSibling,
|
||||||
|
KeyStroke.getKeyStroke('m') to IdeaAction("ShowPopupMenu"),
|
||||||
|
KeyStroke.getKeyStroke('o') to ExpandOrCollapseTreeNode,
|
||||||
|
KeyStroke.getKeyStroke('O') to IdeaAction("FullyExpandTreeNode"),
|
||||||
|
KeyStroke.getKeyStroke('p') to IdeaAction("Tree-selectParentNoCollapse"),
|
||||||
|
KeyStroke.getKeyStroke('q') to CloseParentPopupOrToolWindow(),
|
||||||
|
KeyStroke.getKeyStroke('x') to CollapseSelfOrParentNode,
|
||||||
|
KeyStroke.getKeyStroke('X') to IdeaAction("CollapseTreeNode"),
|
||||||
|
KeyStroke.getKeyStroke('/') to StartSearch(),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
fun install(component: JTree) {
|
||||||
|
if (component.getUserData(KEY) == null) {
|
||||||
|
component.putUserData(KEY, VimNavigationDispatcher(component, ROOT_NODE))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private data object ExpandOrCollapseTreeNode : ActionNode<VimNavigationDispatcher<JTree>> {
|
||||||
|
override fun performAction(holder: VimNavigationDispatcher<JTree>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
|
||||||
|
val tree = holder.component
|
||||||
|
val path = tree.selectionPath ?: return
|
||||||
|
|
||||||
|
if (tree.isExpanded(path)) {
|
||||||
|
tree.collapsePath(path)
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
tree.expandPath(path)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private data object CollapseSelfOrParentNode : ActionNode<VimNavigationDispatcher<JTree>> {
|
||||||
|
override fun performAction(holder: VimNavigationDispatcher<JTree>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
|
||||||
|
val tree = holder.component
|
||||||
|
val path = tree.selectionPath ?: return
|
||||||
|
|
||||||
|
if (tree.isExpanded(path)) {
|
||||||
|
tree.collapsePath(path)
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
val parentPath = path.parentPath
|
||||||
|
if (parentPath.parentPath != null || tree.isRootVisible) {
|
||||||
|
tree.collapsePath(parentPath)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private data object SelectFirstSibling : ActionNode<VimNavigationDispatcher<JTree>> {
|
||||||
|
override fun performAction(holder: VimNavigationDispatcher<JTree>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
|
||||||
|
val tree = holder.component
|
||||||
|
val path = tree.selectionPath ?: return
|
||||||
|
|
||||||
|
val parentPath = path.parentPath ?: return
|
||||||
|
val parentRow = tree.getRowForPath(parentPath)
|
||||||
|
|
||||||
|
tree.setSelectionRow(parentRow + 1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private data object SelectLastSibling : ActionNode<VimNavigationDispatcher<JTree>> {
|
||||||
|
override fun performAction(holder: VimNavigationDispatcher<JTree>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
|
||||||
|
val tree = holder.component
|
||||||
|
val path = tree.selectionPath ?: return
|
||||||
|
|
||||||
|
val siblingPathCount = path.pathCount
|
||||||
|
var testRow = tree.getRowForPath(path)
|
||||||
|
var targetRow = testRow
|
||||||
|
|
||||||
|
while (true) {
|
||||||
|
testRow++
|
||||||
|
|
||||||
|
val testPath = tree.getPathForRow(testRow) ?: break
|
||||||
|
val testPathCount = testPath.pathCount
|
||||||
|
if (testPathCount < siblingPathCount) {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
else if (testPathCount == siblingPathCount) {
|
||||||
|
targetRow = testRow
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tree.setSelectionRow(targetRow)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user