Implement vim-style navigation for menu popups

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.chylex.intellij.keyboardmaster"
-version = "0.6.2"
+version = "0.4.1"
 
 repositories {
 	mavenCentral()
@@ -16,7 +16,7 @@ repositories {
 
 intellij {
 	type.set("IU")
-	version.set("2024.2")
+	version.set("2024.1.1")
 	updateSinceUntilBuild.set(false)
 	
 	plugins.add("com.intellij.java")
@@ -35,7 +35,7 @@ dependencies {
 }
 
 tasks.patchPluginXml {
-	sinceBuild.set("242")
+	sinceBuild.set("241")
 }
 
 tasks.test {

src/main/kotlin/com/chylex/intellij/keyboardmaster/configuration/PluginConfigurable.kt

@@ -17,7 +17,7 @@ class PluginConfigurable : Configurable {
 	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 fully disabled after restarting the IDE.", "Keyboard Master")
+				Messages.showInfoMessage(checkBox, "Vim-style navigation will be disabled after restarting the IDE.", "Keyboard Master")
 			}
 		}
 	}

src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/action/gotoError/GotoNextErrorInOtherModeAction.kt

@@ -2,10 +2,9 @@ package com.chylex.intellij.keyboardmaster.feature.action.gotoError
 
 import com.intellij.codeInsight.CodeInsightActionHandler
 import com.intellij.codeInsight.daemon.impl.actions.GotoNextErrorAction
-import com.intellij.openapi.actionSystem.DataContext
 
 class GotoNextErrorInOtherModeAction : GotoNextErrorAction() {
-	override fun getHandler(dataContext: DataContext): CodeInsightActionHandler {
+	override fun getHandler(): CodeInsightActionHandler {
 		return GotoErrorInOtherModeHandler(forward = true)
 	}
 }

src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/action/gotoError/GotoPreviousErrorInOtherModeAction.kt

@@ -2,10 +2,9 @@ package com.chylex.intellij.keyboardmaster.feature.action.gotoError
 
 import com.intellij.codeInsight.CodeInsightActionHandler
 import com.intellij.codeInsight.daemon.impl.actions.GotoPreviousErrorAction
-import com.intellij.openapi.actionSystem.DataContext
 
 class GotoPreviousErrorInOtherModeAction : GotoPreviousErrorAction() {
-	override fun getHandler(dataContext: DataContext): CodeInsightActionHandler {
+	override fun getHandler(): CodeInsightActionHandler {
 		return GotoErrorInOtherModeHandler(forward = false)
 	}
 }

src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/action/gotoType/GotoTypeInFileHandler.kt

@@ -52,7 +52,7 @@ class GotoTypeInFileHandler(private val forward: Boolean) : CodeInsightActionHan
 	
 	private companion object {
 		fun getNavigationOffsets(file: PsiFile, searchedOffsetRange: IntRange): IntArray {
-			val structureViewBuilder = LanguageStructureViewBuilder.getInstance().getStructureViewBuilder(file)
+			val structureViewBuilder = LanguageStructureViewBuilder.INSTANCE.getStructureViewBuilder(file)
 			if (structureViewBuilder !is TreeBasedStructureViewBuilder) {
 				return intArrayOf()
 			}

src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/codeCompletion/CodeCompletionPopupConfiguration.kt

@@ -1,13 +1,13 @@
 package com.chylex.intellij.keyboardmaster.feature.codeCompletion
 
-import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap
+import com.intellij.util.containers.IntIntHashMap
 
 object CodeCompletionPopupConfiguration {
 	const val SHORTCUT_NONE = -1
 	const val SHORTCUT_NEXT_PAGE = -2
 	const val SHORTCUT_PREV_PAGE = -3
 	
-	private val charToShortcutMap = Int2IntOpenHashMap(16).also { it.defaultReturnValue(SHORTCUT_NONE) }
+	private val charToShortcutMap = IntIntHashMap(16, SHORTCUT_NONE)
 	private var hintTexts = mutableListOf<String>()
 	
 	val itemShortcutCount

src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/KeyStrokeNode.kt

@@ -17,7 +17,7 @@ internal interface KeyStrokeNode<T> {
 				add(key)
 				
 				if (node is Parent) {
-					addAll(node.allKeyStrokes)
+					node.collectKeys(this)
 				}
 			}
 		}
@@ -32,22 +32,14 @@ internal interface KeyStrokeNode<T> {
 			return keys[keyStroke] ?: this
 		}
 		
-		operator fun plus(other: Parent<T>): Parent<T> {
+		private fun collectKeys(target: MutableSet<KeyStroke>) {
-			val mergedKeys = HashMap(keys)
+			for ((key, node) in keys) {
+				target.add(key)
 				
-			for ((otherKey, otherNode) in other.keys) {
+				if (node is Parent) {
-				if (otherNode is Parent) {
+					node.collectKeys(target)
-					val ourNode = keys[otherKey]
-					if (ourNode is Parent) {
-						mergedKeys[otherKey] = ourNode + otherNode
-						continue
-					}
 				}
-				
-				mergedKeys[otherKey] = otherNode
 			}
-			
-			return Parent(mergedKeys)
 		}
 	}
 	
@@ -59,7 +51,7 @@ internal interface KeyStrokeNode<T> {
 		override fun performAction(holder: T, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
 			val action = actionEvent.actionManager.getAction(name) ?: return
 			
-			val dataContext = CustomizedDataContext.withProvider(actionEvent.dataContext) {
+			val dataContext = CustomizedDataContext.create(actionEvent.dataContext) {
 				when {
 					PlatformDataKeys.CONTEXT_COMPONENT.`is`(it) -> holder.component
 					else                                        -> null

src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/PopupInterceptor.kt

@@ -8,7 +8,7 @@ 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 && VimNavigation.isEnabled) {
+		if (component is ListPopupImpl) {
 			VimListNavigation.install(component.list, component)
 		}
 		

src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/VimNavigation.kt

@@ -4,7 +4,6 @@ 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.ide.ui.UISettings
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.ui.UiInterceptors
 import com.intellij.util.ui.StartupUiUtil
@@ -18,53 +17,49 @@ import javax.swing.KeyStroke
 import javax.swing.UIManager
 
 object VimNavigation {
-	private val isEnabledFlag = AtomicBoolean(false)
+	private val isEnabled = AtomicBoolean(false)
 	private var originalPopupBindings: Array<*>? = null
 	
-	val isEnabled
-		get() = isEnabledFlag.get()
-	
 	fun register() {
 		val disposable = ApplicationManager.getApplication().getService(PluginDisposableService::class.java)
 		
-		StartupUiUtil.addAwtListener(AWTEvent.FOCUS_EVENT_MASK, disposable, ::handleEvent)
+		StartupUiUtil.addAwtListener(::handleEvent, AWTEvent.FOCUS_EVENT_MASK, disposable)
 		UiInterceptors.registerPersistent(disposable, PopupInterceptor)
 	}
 	
 	fun setEnabled(enabled: Boolean) {
-		if (!isEnabledFlag.compareAndSet(!enabled, enabled)) {
+		if (!isEnabled.compareAndSet(!enabled, enabled)) {
 			return
 		}
 		
-		ApplicationManager.getApplication().invokeLater {
+		if (enabled) {
-			if (enabled) {
+			val originalBindings = (UIManager.get("PopupMenu.selectedWindowInputMapBindings") as Array<*>).also { originalPopupBindings = it }
-				val originalBindings = (UIManager.get("PopupMenu.selectedWindowInputMapBindings") as Array<*>).also { originalPopupBindings = it }
+			val updatedBindings = mutableListOf(*originalBindings)
-				val updatedBindings = mutableListOf(*originalBindings)
 			
-				addBinding(updatedBindings, "selectParent", setOf('h', 'p', 'x'))
+			updatedBindings.add(KeyStroke.getKeyStroke('h'))
-				addBinding(updatedBindings, "selectNext", setOf('j'))
+			updatedBindings.add("selectParent")
-				addBinding(updatedBindings, "selectPrevious", setOf('k'))
-				addBinding(updatedBindings, "selectChild", setOf('l', 'o'))
-				addBinding(updatedBindings, "cancel", setOf('q'))
 			
-				UIManager.put("PopupMenu.selectedWindowInputMapBindings", updatedBindings.toTypedArray())
+			updatedBindings.add(KeyStroke.getKeyStroke('j'))
-				UISettings.getInstance().disableMnemonics = true
+			updatedBindings.add("selectNext")
-			}
+			
-			else {
+			updatedBindings.add(KeyStroke.getKeyStroke('k'))
-				UIManager.put("PopupMenu.selectedWindowInputMapBindings", originalPopupBindings)
+			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 addBinding(bindings: MutableList<Any?>, action: String, chars: Set<Char>) {
-		for (char in chars) {
-			bindings.add(KeyStroke.getKeyStroke(char))
-			bindings.add(action)
 		}
 	}
 	
 	private fun handleEvent(event: AWTEvent) {
-		if (event is FocusEvent && event.id == FocusEvent.FOCUS_GAINED && isEnabled) {
+		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)

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

@@ -1,102 +1,56 @@
 package com.chylex.intellij.keyboardmaster.feature.vimNavigation
 
-import com.chylex.intellij.keyboardmaster.feature.vimNavigation.VimNavigationDispatcher.WrappedAction.ForKeyListener
+import com.chylex.intellij.keyboardmaster.PluginDisposableService
-import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.ActionUpdateThread
-import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import com.intellij.openapi.actionSystem.KeyboardShortcut
+import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.actionSystem.ex.ActionUtil
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.DumbAwareAction
-import com.intellij.openapi.util.SystemInfo
+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 com.intellij.util.containers.JBIterable
-import java.awt.Container
-import java.awt.event.ActionEvent
-import java.awt.event.ActionListener
 import java.awt.event.KeyEvent
-import java.beans.PropertyChangeEvent
 import java.util.concurrent.atomic.AtomicBoolean
-import javax.swing.Action
 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>>, disposable: Disposable? = null) : DumbAwareAction(), ComponentHolder {
+internal open class VimNavigationDispatcher<T : JComponent>(final override val component: T, private val rootNode: KeyStrokeNode.Parent<VimNavigationDispatcher<T>>) : DumbAwareAction(), ComponentHolder {
-	companion object {
+	private companion object {
-		@JvmStatic
+		private val DISPOSABLE = ApplicationManager.getApplication().getService(PluginDisposableService::class.java)
-		protected val ENTER_KEY: KeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0)
+		private val EXTRA_SHORTCUTS = setOf(
-		
+			KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),
-		private val CTRL_ENTER_KEY: KeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.CTRL_DOWN_MASK)
+			KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0),
-		private val META_ENTER_KEY: KeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.META_DOWN_MASK)
+		)
-		
-		private fun findOriginalEnterAction(component: JComponent): WrappedAction {
-			var originalEnterAction: WrappedAction? = null
-			
-			for (container in JBIterable.generate<Container>(component) { it.parent }) {
-				if (container !is JComponent) {
-					continue
-				}
-				
-				container.getActionForKeyStroke(ENTER_KEY)?.takeUnless(::isIgnoredEnterAction)?.let {
-					originalEnterAction = WrappedAction.ForActionListener(container, it)
-				}
-				
-				for (action in ActionUtil.getActions(container)) {
-					if (action.shortcutSet.shortcuts.any { it is KeyboardShortcut && it.firstKeyStroke == ENTER_KEY && it.secondKeyStroke == null }) {
-						originalEnterAction = WrappedAction.ForAnAction(action)
-					}
-				}
-			}
-			
-			return originalEnterAction ?: ForKeyListener(component)
-		}
-		
-		private fun isIgnoredEnterAction(action: ActionListener): Boolean {
-			return action is Action && action.getValue(Action.NAME) == "toggle"
-		}
-		
-		@Suppress("UnstableApiUsage")
-		fun JComponent.getParentToolWindowId(): String? {
-			return InternalDecoratorImpl.findNearestDecorator(this)?.toolWindowId
-		}
 	}
 	
-	private val originalEnterAction = findOriginalEnterAction(component)
 	private var currentNode: KeyStrokeNode.Parent<VimNavigationDispatcher<T>> = rootNode
 	var isSearching = AtomicBoolean(false)
 	
 	init {
-		registerCustomShortcutSet(KeyStrokeNode.getAllShortcuts(getAllKeyStrokes()), component, disposable)
+		registerCustomShortcutSet(KeyStrokeNode.getAllShortcuts(getAllKeyStrokes()), component, DISPOSABLE)
-		SpeedSearchSupply.getSupply(component, true)?.addChangeListener(::handleSpeedSearchChange)
+		
+		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, setOf(ENTER_KEY, CTRL_ENTER_KEY, META_ENTER_KEY))
+		return KeyStrokeNode.getAllKeyStrokes(rootNode, EXTRA_SHORTCUTS)
-	}
-	
-	private fun handleSpeedSearchChange(e: PropertyChangeEvent) {
-		if (e.propertyName == SpeedSearchSupply.ENTERED_PREFIX_PROPERTY_NAME) {
-			val speedSearch = e.source as? SpeedSearchSupply ?: return
-			
-			ApplicationManager.getApplication().invokeLater {
-				if (!speedSearch.isPopupActive) {
-					isSearching.set(false)
-					currentNode = rootNode
-				}
-			}
-		}
 	}
 	
 	final override fun actionPerformed(e: AnActionEvent) {
 		val keyEvent = e.inputEvent as? KeyEvent ?: return
 		
-		if (keyEvent.id == KeyEvent.KEY_PRESSED && keyEvent.keyCode == KeyEvent.VK_ENTER) {
+		if (keyEvent.id == KeyEvent.KEY_PRESSED && handleSpecialKeyPress(keyEvent, e.dataContext)) {
-			handleEnterKeyPress(e, keyEvent)
+			currentNode = rootNode
 			return
 		}
 		
@@ -109,68 +63,65 @@ internal open class VimNavigationDispatcher<T : JComponent>(final override val c
 		}
 	}
 	
-	private fun handleEnterKeyPress(actionEvent: AnActionEvent, keyEvent: KeyEvent) {
+	private fun handleSpecialKeyPress(keyEvent: KeyEvent, dataContext: DataContext): Boolean {
-		handleEnterKeyPress(keyEvent) { originalEnterAction.perform(actionEvent, it) }
+		if (keyEvent.keyCode == KeyEvent.VK_ESCAPE) {
+			return true
+		}
+		
+		if (keyEvent.keyCode == KeyEvent.VK_ENTER) {
+			handleEnterKeyPress(dataContext)
+			return true
+		}
+		
+		return false
 	}
 	
-	protected inline fun handleEnterKeyPress(keyEvent: KeyEvent, originalAction: (KeyEvent) -> Unit) {
+	private fun handleEnterKeyPress(dataContext: DataContext) {
-		if (isSearching.compareAndSet(true, false) && !runEnterActionImmediately(keyEvent)) {
+		if (isSearching.compareAndSet(true, false)) {
-			stopSpeedSearch()
+			when (val supply = SpeedSearchSupply.getSupply(component)) {
+				is SpeedSearchBase<*> -> supply.hidePopup()
+				is SpeedSearch        -> supply.reset()
+			}
 		}
 		else {
-			currentNode = rootNode
+			val navigatables = dataContext.getData(CommonDataKeys.NAVIGATABLE_ARRAY)?.filter(Navigatable::canNavigate).orEmpty()
-			originalAction(keyEvent)
+			for ((index, navigatable) in navigatables.withIndex()) {
-		}
+				navigatable.navigate(index == navigatables.lastIndex)
-	}
+			}
-	
-	private fun runEnterActionImmediately(keyEvent: KeyEvent): Boolean {
-		return if (SystemInfo.isMac) keyEvent.isMetaDown else keyEvent.isControlDown
-	}
-	
-	protected open fun stopSpeedSearch() {
-		when (val supply = SpeedSearchSupply.getSupply(component)) {
-			is SpeedSearchBase<*> -> supply.hidePopup()
-			is SpeedSearch        -> supply.reset()
 		}
 	}
 	
 	final override fun update(e: AnActionEvent) {
-		e.presentation.isEnabled = !ignoreEventDueToActiveSearch(e) && !ignoreEventDueToActiveEditing(e)
+		e.presentation.isEnabled = !isSearching.get() || e.inputEvent.let { it is KeyEvent && it.id == KeyEvent.KEY_PRESSED && it.keyCode == KeyEvent.VK_ENTER }
-	}
-	
-	private fun ignoreEventDueToActiveSearch(e: AnActionEvent): Boolean {
-		return isSearching.get() && !e.inputEvent.let { it is KeyEvent && it.id == KeyEvent.KEY_PRESSED && it.keyCode == KeyEvent.VK_ENTER }
-	}
-	
-	private fun ignoreEventDueToActiveEditing(e: AnActionEvent): Boolean {
-		// Avoid stealing keys from inline text fields.
-		return e.dataContext.getData(CommonDataKeys.EDITOR) != null
 	}
 	
 	final override fun getActionUpdateThread(): ActionUpdateThread {
 		return ActionUpdateThread.BGT
 	}
 	
-	private sealed interface WrappedAction {
+	class StartSearch<T : JComponent> : KeyStrokeNode.ActionNode<VimNavigationDispatcher<T>> {
-		fun perform(actionEvent: AnActionEvent, keyEvent: KeyEvent)
+		@Suppress("UnstableApiUsage")
-		
+		override fun performAction(holder: VimNavigationDispatcher<T>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
-		class ForActionListener(private val component: JComponent, private val listener: ActionListener) : WrappedAction {
+			val speedSearch = SpeedSearchSupply.getSupply(holder.component, true) as? SpeedSearchActivator ?: return
-			override fun perform(actionEvent: AnActionEvent, keyEvent: KeyEvent) {
+			if (speedSearch.isAvailable) {
-				listener.actionPerformed(ActionEvent(component, ActionEvent.ACTION_PERFORMED, "Enter", keyEvent.`when`, keyEvent.modifiersEx))
+				holder.isSearching.set(true)
-			}
+				speedSearch.activate()
-		}
-		
-		class ForAnAction(val action: AnAction) : WrappedAction {
-			override fun perform(actionEvent: AnActionEvent, keyEvent: KeyEvent) {
-				action.actionPerformed(actionEvent)
-			}
-		}
-		
-		class ForKeyListener(private val component: JComponent) : WrappedAction {
-			override fun perform(actionEvent: AnActionEvent, keyEvent: KeyEvent) {
-				val unconsumedKeyEvent = KeyEvent(component, keyEvent.id, keyEvent.`when`, keyEvent.modifiersEx, keyEvent.keyCode, keyEvent.keyChar, keyEvent.keyLocation)
-				component.dispatchEvent(unconsumedKeyEvent)
 			}
 		}
 	}
+	
+	@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)
+		}
+	}
 }

src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/components/VimCommonNavigation.kt

@@ -1,66 +0,0 @@
-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.Companion.getParentToolWindowId
-import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.wm.ToolWindowId
-import com.intellij.openapi.wm.ex.ToolWindowManagerEx
-import com.intellij.ui.speedSearch.SpeedSearchActivator
-import com.intellij.ui.speedSearch.SpeedSearchSupply
-import java.awt.event.KeyEvent
-import javax.swing.JComponent
-import javax.swing.KeyStroke
-
-internal object VimCommonNavigation {
-	fun <T : JComponent> commonRootNode() = Parent<VimNavigationDispatcher<T>>(
-		mapOf(
-			KeyStroke.getKeyStroke('A') to IdeaAction("MaximizeToolWindow"),
-			KeyStroke.getKeyStroke('f') to StartSearch(),
-			KeyStroke.getKeyStroke('I') to ToggleExcludedFilesInProjectView(),
-			KeyStroke.getKeyStroke('m') to IdeaAction("ShowPopupMenu"),
-			KeyStroke.getKeyStroke('r') to IdeaAction("SynchronizeCurrentFile"),
-			KeyStroke.getKeyStroke('R') to IdeaAction("Synchronize"),
-			KeyStroke.getKeyStroke('q') to CloseParentPopupOrToolWindow(),
-			KeyStroke.getKeyStroke('/') to StartSearch(),
-		)
-	)
-	
-	
-	private class StartSearch<T : JComponent> : 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()
-			}
-		}
-	}
-	
-	private class CloseParentPopupOrToolWindow<T : JComponent> : 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 toolWindowId = holder.component.getParentToolWindowId() ?: return
-			ToolWindowManagerEx.getInstanceEx(project).hideToolWindow(toolWindowId, true)
-		}
-	}
-	
-	private class ToggleExcludedFilesInProjectView<T : JComponent> : ActionNode<VimNavigationDispatcher<T>> {
-		private val showExcludedFilesAction = IdeaAction<VimNavigationDispatcher<T>>("ProjectView.ShowExcludedFiles")
-		
-		override fun performAction(holder: VimNavigationDispatcher<T>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
-			if (holder.component.getParentToolWindowId() == ToolWindowId.PROJECT_VIEW) {
-				showExcludedFilesAction.performAction(holder, actionEvent, keyEvent)
-			}
-		}
-	}
-}

src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/components/VimListNavigation.kt

@@ -3,12 +3,13 @@ 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.popup.list.ListPopupImpl
 import com.intellij.ui.speedSearch.SpeedSearch
 import com.intellij.ui.speedSearch.SpeedSearchSupply
 import java.awt.event.ActionEvent
@@ -20,8 +21,10 @@ import javax.swing.KeyStroke
 internal object VimListNavigation {
 	private val KEY = Key.create<VimNavigationDispatcher<JList<*>>>("KeyboardMaster-VimListNavigation")
 	
-	private val ROOT_NODE = VimCommonNavigation.commonRootNode<JList<*>>() + Parent(
+	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"),
@@ -29,21 +32,12 @@ internal object VimListNavigation {
 			),
 			KeyStroke.getKeyStroke('G') to IdeaAction("List-selectLastRow"),
 			KeyStroke.getKeyStroke('h') to IdeaAction("List-selectPreviousColumn"),
-			KeyStroke.getKeyStroke('H') to IdeaAction("List-selectPreviousColumnExtendSelection"),
 			KeyStroke.getKeyStroke('j') to IdeaAction("List-selectNextRow"),
-			KeyStroke.getKeyStroke('J') to IdeaAction("List-selectNextRowExtendSelection"),
 			KeyStroke.getKeyStroke('k') to IdeaAction("List-selectPreviousRow"),
-			KeyStroke.getKeyStroke('K') to IdeaAction("List-selectPreviousRowExtendSelection"),
 			KeyStroke.getKeyStroke('l') to IdeaAction("List-selectNextColumn"),
-			KeyStroke.getKeyStroke('L') to IdeaAction("List-selectNextColumnExtendSelection"),
+			KeyStroke.getKeyStroke('m') to IdeaAction("ShowPopupMenu"),
-		)
+			KeyStroke.getKeyStroke('q') to CloseParentPopupOrToolWindow(),
-	)
+			KeyStroke.getKeyStroke('/') to StartSearch(),
-	
-	private val POPUP_LIST_ROOT_NODE = ROOT_NODE + Parent(
-		mapOf(
-			KeyStroke.getKeyStroke('o') to IdeaAction("List-selectNextColumn"),
-			KeyStroke.getKeyStroke('p') to IdeaAction("List-selectPreviousColumn"),
-			KeyStroke.getKeyStroke('x') to IdeaAction("List-selectPreviousColumn"),
 		)
 	)
 	
@@ -60,7 +54,7 @@ internal object VimListNavigation {
 	}
 	
 	@Suppress("serial")
-	private class VimPopupListNavigationDispatcher(component: JList<*>, override val popup: WizardPopup) : VimNavigationDispatcher<JList<*>>(component, POPUP_LIST_ROOT_NODE, popup.parent) {
+	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) {
@@ -86,24 +80,6 @@ internal object VimListNavigation {
 			// 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)
-			
-			if (popup is ListPopupImpl) {
-				popup.registerAction("KeyboardMaster-VimListNavigation-Enter", ENTER_KEY, object : AbstractAction() {
-					override fun actionPerformed(e: ActionEvent) {
-						handleEnterKeyPress(createEnterEvent(e)) { popup.handleSelect(true, it) }
-					}
-					
-					private fun createEnterEvent(e: ActionEvent): KeyEvent {
-						return KeyEvent(component, KeyEvent.KEY_PRESSED, e.`when`, e.modifiers, KeyEvent.VK_ENTER, KeyEvent.CHAR_UNDEFINED)
-					}
-				})
-			}
-		}
-		
-		override fun stopSpeedSearch() {
-			val selectedValue = component.selectedValue
-			super.stopSpeedSearch()
-			component.setSelectedValue(selectedValue, true)
 		}
 		
 		private class PauseSpeedSearchAction(private val dispatcher: VimNavigationDispatcher<JList<*>>, private val speedSearch: SpeedSearch) : AbstractAction() {

src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/components/VimTableNavigation.kt

@@ -3,6 +3,8 @@ 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
@@ -12,8 +14,10 @@ import javax.swing.KeyStroke
 internal object VimTableNavigation {
 	private val KEY = Key.create<VimNavigationDispatcher<JTable>>("KeyboardMaster-VimTableNavigation")
 	
-	private val ROOT_NODE = VimCommonNavigation.commonRootNode<JTable>() + Parent(
+	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"),
@@ -21,13 +25,12 @@ internal object VimTableNavigation {
 			),
 			KeyStroke.getKeyStroke('G') to IdeaAction("Table-selectLastRow"),
 			KeyStroke.getKeyStroke('h') to IdeaAction("Table-selectPreviousColumn"),
-			KeyStroke.getKeyStroke('H') to IdeaAction("Table-selectPreviousColumnExtendSelection"),
 			KeyStroke.getKeyStroke('j') to IdeaAction("Table-selectNextRow"),
-			KeyStroke.getKeyStroke('J') to IdeaAction("Table-selectNextRowExtendSelection"),
 			KeyStroke.getKeyStroke('k') to IdeaAction("Table-selectPreviousRow"),
-			KeyStroke.getKeyStroke('K') to IdeaAction("Table-selectPreviousRowExtendSelection"),
 			KeyStroke.getKeyStroke('l') to IdeaAction("Table-selectNextColumn"),
-			KeyStroke.getKeyStroke('L') to IdeaAction("Table-selectNextColumnExtendSelection"),
+			KeyStroke.getKeyStroke('m') to IdeaAction("ShowPopupMenu"),
+			KeyStroke.getKeyStroke('q') to CloseParentPopupOrToolWindow(),
+			KeyStroke.getKeyStroke('/') to StartSearch(),
 		)
 	)
 	

src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/components/VimTreeNavigation.kt

@@ -4,47 +4,43 @@ import com.chylex.intellij.keyboardmaster.feature.vimNavigation.KeyStrokeNode.Ac
 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 com.intellij.ui.ClientProperty
-import com.intellij.ui.tree.ui.DefaultTreeUI
 import java.awt.event.KeyEvent
 import javax.swing.JTree
 import javax.swing.KeyStroke
-import javax.swing.tree.TreePath
 
 internal object VimTreeNavigation {
 	private val KEY = Key.create<VimNavigationDispatcher<JTree>>("KeyboardMaster-VimTreeNavigation")
 	
-	private val ROOT_NODE = VimCommonNavigation.commonRootNode<JTree>() + Parent(
+	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('j') to SelectLastSibling,
-					KeyStroke.getKeyStroke('k') to SelectFirstSibling,
-					KeyStroke.getKeyStroke('o') to ExpandChildrenToNextLevel,
 				)
 			),
 			KeyStroke.getKeyStroke('G') to IdeaAction("Tree-selectLast"),
-			KeyStroke.getKeyStroke('h') to CollapseSelfOrMoveToParentNode,
-			KeyStroke.getKeyStroke('H') to CollapseUntilRootNode,
 			KeyStroke.getKeyStroke('j') to IdeaAction("Tree-selectNext"),
 			KeyStroke.getKeyStroke('j', KeyEvent.ALT_DOWN_MASK) to IdeaAction("Tree-selectNextSibling"),
-			KeyStroke.getKeyStroke('J') to IdeaAction("Tree-selectNextExtendSelection"),
+			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 IdeaAction("Tree-selectPreviousExtendSelection"),
+			KeyStroke.getKeyStroke('K') to SelectFirstSibling,
-			KeyStroke.getKeyStroke('l') to ExpandSelfOrMoveToFirstChildNode,
+			KeyStroke.getKeyStroke('m') to IdeaAction("ShowPopupMenu"),
-			KeyStroke.getKeyStroke('L') to ExpandUntilFirstLeafNode,
 			KeyStroke.getKeyStroke('o') to ExpandOrCollapseTreeNode,
 			KeyStroke.getKeyStroke('O') to IdeaAction("FullyExpandTreeNode"),
 			KeyStroke.getKeyStroke('p') to IdeaAction("Tree-selectParentNoCollapse"),
-			KeyStroke.getKeyStroke('P') to IdeaAction("Tree-selectFirst"),
+			KeyStroke.getKeyStroke('q') to CloseParentPopupOrToolWindow(),
 			KeyStroke.getKeyStroke('x') to CollapseSelfOrParentNode,
-			KeyStroke.getKeyStroke('X') to CollapseAll,
+			KeyStroke.getKeyStroke('X') to IdeaAction("CollapseTreeNode"),
+			KeyStroke.getKeyStroke('/') to StartSearch(),
 		)
 	)
 	
@@ -63,51 +59,7 @@ internal object VimTreeNavigation {
 				tree.collapsePath(path)
 			}
 			else {
-				runWithoutAutoExpand(tree) { tree.expandPath(path) }
+				tree.expandPath(path)
-			}
-		}
-	}
-	
-	private data object ExpandSelfOrMoveToFirstChildNode : ActionNode<VimNavigationDispatcher<JTree>> {
-		override fun performAction(holder: VimNavigationDispatcher<JTree>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
-			val tree = holder.component
-			val path = tree.selectionPath?.takeUnless { isLeaf(tree, it) } ?: return
-			
-			if (tree.isExpanded(path)) {
-				selectRow(tree, getFirstChild(tree, path))
-			}
-			else {
-				runWithoutAutoExpand(tree) { tree.expandPath(path) }
-			}
-		}
-	}
-	
-	private data object ExpandUntilFirstLeafNode : ActionNode<VimNavigationDispatcher<JTree>> {
-		override fun performAction(holder: VimNavigationDispatcher<JTree>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
-			val tree = holder.component
-			val path = tree.selectionPath ?: return
-			
-			var firstChildPath = path
-			
-			while (!isLeaf(tree, firstChildPath)) {
-				tree.expandPath(firstChildPath)
-				firstChildPath = getFirstChild(tree, firstChildPath)
-			}
-			
-			selectRow(tree, firstChildPath)
-		}
-	}
-	
-	private data object CollapseSelfOrMoveToParentNode : 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)) {
-				collapseAndScroll(tree, path)
-			}
-			else {
-				withParentPath(tree, path) { selectRow(tree, it) }
 			}
 		}
 	}
@@ -118,73 +70,14 @@ internal object VimTreeNavigation {
 			val path = tree.selectionPath ?: return
 			
 			if (tree.isExpanded(path)) {
-				collapseAndScroll(tree, path)
+				tree.collapsePath(path)
 			}
 			else {
-				withParentPath(tree, path) { collapseAndScroll(tree, it) }
+				val parentPath = path.parentPath
-			}
+				if (parentPath.parentPath != null || tree.isRootVisible) {
-		}
+					tree.collapsePath(parentPath)
-	}
-	
-	private data object CollapseUntilRootNode : ActionNode<VimNavigationDispatcher<JTree>> {
-		override fun performAction(holder: VimNavigationDispatcher<JTree>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
-			val tree = holder.component
-			val path = tree.selectionPath ?: return
-			
-			var parentPath = path
-			
-			while (true) {
-				parentPath = parentPath.parentPath.takeUnless { isInvisibleRoot(tree, it) } ?: break
-			}
-			
-			collapseAndScroll(tree, parentPath)
-		}
-	}
-	
-	private data object CollapseAll : ActionNode<VimNavigationDispatcher<JTree>> {
-		override fun performAction(holder: VimNavigationDispatcher<JTree>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
-			val tree = holder.component
-			
-			CollapseUntilRootNode.performAction(holder, actionEvent, keyEvent)
-			
-			var row = 0
-			
-			while (row < tree.rowCount) {
-				tree.collapseRow(row)
-				row++
-			}
-		}
-	}
-	
-	private data object ExpandChildrenToNextLevel : ActionNode<VimNavigationDispatcher<JTree>> {
-		override fun performAction(holder: VimNavigationDispatcher<JTree>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
-			val tree = holder.component
-			val model = tree.model
-			val path = tree.selectionPath?.takeUnless { isLeaf(tree, it) } ?: return
-			
-			var pathsToExpand = mutableListOf(path)
-			
-			do {
-				if (pathsToExpand.any(tree::isCollapsed)) {
-					runWithoutAutoExpand(tree) { pathsToExpand.forEach(tree::expandPath) }
-					break
 				}
-				
+			}
-				val nextPathsToExpand = mutableListOf<TreePath>()
-				
-				for (parentPath in pathsToExpand) {
-					val lastPathComponent = parentPath.lastPathComponent
-					
-					for (i in 0 until model.getChildCount(lastPathComponent)) {
-						val child = model.getChild(lastPathComponent, i)
-						if (!model.isLeaf(child)) {
-							nextPathsToExpand.add(parentPath.pathByAddingChild(child))
-						}
-					}
-				}
-				
-				pathsToExpand = nextPathsToExpand
-			} while (pathsToExpand.isNotEmpty())
 		}
 	}
 	
@@ -196,7 +89,7 @@ internal object VimTreeNavigation {
 			val parentPath = path.parentPath ?: return
 			val parentRow = tree.getRowForPath(parentPath)
 			
-			selectRow(tree, parentRow + 1)
+			tree.setSelectionRow(parentRow + 1)
 		}
 	}
 	
@@ -222,50 +115,7 @@ internal object VimTreeNavigation {
 				}
 			}
 			
-			selectRow(tree, targetRow)
+			tree.setSelectionRow(targetRow)
 		}
 	}
-	
-	private inline fun runWithoutAutoExpand(tree: JTree, action: () -> Unit) {
-		val previousAutoExpandValue = ClientProperty.get(tree, DefaultTreeUI.AUTO_EXPAND_ALLOWED)
-		ClientProperty.put(tree, DefaultTreeUI.AUTO_EXPAND_ALLOWED, false)
-		try {
-			action()
-		} finally {
-			ClientProperty.put(tree, DefaultTreeUI.AUTO_EXPAND_ALLOWED, previousAutoExpandValue)
-		}
-	}
-	
-	private fun selectRow(tree: JTree, row: Int) {
-		tree.setSelectionRow(row)
-		tree.scrollRowToVisible(row)
-	}
-	
-	private fun selectRow(tree: JTree, path: TreePath) {
-		selectRow(tree, tree.getRowForPath(path))
-	}
-	
-	private fun collapseAndScroll(tree: JTree, path: TreePath) {
-		tree.collapsePath(path)
-		tree.scrollRowToVisible(tree.getRowForPath(path))
-	}
-	
-	private inline fun withParentPath(tree: JTree, path: TreePath, action: (TreePath) -> Unit) {
-		val parentPath = path.parentPath
-		if (!isInvisibleRoot(tree, parentPath)) {
-			action(parentPath)
-		}
-	}
-	
-	private fun isInvisibleRoot(tree: JTree, parentPath: TreePath): Boolean {
-		return parentPath.parentPath == null && !tree.isRootVisible
-	}
-	
-	private fun getFirstChild(tree: JTree, path: TreePath): TreePath {
-		return path.pathByAddingChild(tree.model.getChild(path.lastPathComponent, 0))
-	}
-	
-	private fun isLeaf(tree: JTree, firstChildPath: TreePath): Boolean {
-		return tree.model.isLeaf(firstChildPath.lastPathComponent)
-	}
 }

src/main/resources/META-INF/plugin.xml

@@ -7,7 +7,6 @@
     Collection of keyboard-centric additions.
     <ul>
       <li>Code completion items can be jumped to using customizable characters (numbers by default).</li>
-      <li>Vim-style navigation in lists / trees / tables.</li>
       <li>Action to go to next/previous highlighted error in other mode.</li>
       <li>Action to go to next/previous type in file.</li>
     </ul>