Release version 0.6.6

.gitignore

@@ -2,4 +2,5 @@
 !/.idea/runConfigurations
 
 /.gradle/
+/.intellijPlatform/
 /build/

build.gradle.kts

@@ -1,49 +1,56 @@
 @file:Suppress("ConvertLambdaToReference")
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
-	kotlin("jvm") version "1.9.22"
+	kotlin("jvm")
-	id("org.jetbrains.intellij") version "1.17.3"
+	id("org.jetbrains.intellij.platform")
 }
 
 group = "com.chylex.intellij.keyboardmaster"
-version = "0.5.0"
+version = "0.6.6"
 
 repositories {
 	mavenCentral()
+	
+	intellijPlatform {
+		defaultRepositories()
+	}
 }
 
-intellij {
+dependencies {
-	type.set("IU")
+	intellijPlatform {
-	version.set("2024.1.1")
+		@Suppress("DEPRECATION")
-	updateSinceUntilBuild.set(false)
+		intellijIdeaUltimate("2024.2")
+		
+		bundledPlugin("com.intellij.java")
+		
+		if (System.getenv("IDEAVIM") == "1") {
+			plugin("IdeaVIM", "2.10.2")
+		}
+	}
 	
-	plugins.add("com.intellij.java")
+	testImplementation("org.junit.jupiter:junit-jupiter:5.11.0-M1")
-	
+}
-	if (System.getenv("IDEAVIM") == "1") {
+
-		plugins.add("IdeaVIM:2.10.2")
+intellijPlatform {
+	pluginConfiguration {
+		ideaVersion {
+			sinceBuild.set("242")
+			untilBuild.set(provider { null })
+		}
 	}
 }
 
 kotlin {
-	jvmToolchain(17)
+	jvmToolchain(21)
-}
+	
-
+	compilerOptions {
-dependencies {
+		freeCompilerArgs = listOf(
-	testImplementation("org.junit.jupiter:junit-jupiter:5.11.0-M1")
+			"-X" + "jvm-default=all",
-}
+			"-X" + "lambdas=indy"
-
+		)
-tasks.patchPluginXml {
+	}
-	sinceBuild.set("241")
 }
 
 tasks.test {
 	useJUnitPlatform()
 }
-
-tasks.withType<KotlinCompile> {
-	kotlinOptions.freeCompilerArgs = listOf(
-		"-Xjvm-default=all"
-	)
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -145,7 +147,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +155,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +204,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
+# Collect all arguments for the java command:
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     shell script including quotes and variable substitutions, so put them in
+#     and any embedded shellness will be escaped.
-#     double quotes to make sure that they get re-expanded; and
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#   * put everything else in single quotes, so that it's not re-expanded.
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 

settings.gradle.kts

@@ -1,2 +1,8 @@
 rootProject.name = "KeyboardMaster"
 
+pluginManagement {
+	plugins {
+		kotlin("jvm") version "1.9.24"
+		id("org.jetbrains.intellij.platform") version "2.9.0"
+	}
+}

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

@@ -2,9 +2,10 @@ 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(): CodeInsightActionHandler {
+	override fun getHandler(dataContext: DataContext): CodeInsightActionHandler {
 		return GotoErrorInOtherModeHandler(forward = true)
 	}
 }

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

@@ -2,9 +2,10 @@ 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(): CodeInsightActionHandler {
+	override fun getHandler(dataContext: DataContext): 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.INSTANCE.getStructureViewBuilder(file)
+			val structureViewBuilder = LanguageStructureViewBuilder.getInstance().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 com.intellij.util.containers.IntIntHashMap
+import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap
 
 object CodeCompletionPopupConfiguration {
 	const val SHORTCUT_NONE = -1
 	const val SHORTCUT_NEXT_PAGE = -2
 	const val SHORTCUT_PREV_PAGE = -3
 	
-	private val charToShortcutMap = IntIntHashMap(16, SHORTCUT_NONE)
+	private val charToShortcutMap = Int2IntOpenHashMap(16).also { it.defaultReturnValue(SHORTCUT_NONE) }
 	private var hintTexts = mutableListOf<String>()
 	
 	val itemShortcutCount

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

@@ -24,14 +24,22 @@ internal interface KeyStrokeNode<T> {
 		
 		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())
+				isCharEvent(keyEvent) -> KeyStroke.getKeyStroke(keyEvent.keyChar, keyEvent.modifiersEx and KeyEvent.SHIFT_DOWN_MASK.inv())
-				keyEvent.id == KeyEvent.KEY_PRESSED         -> KeyStroke.getKeyStroke(keyEvent.keyCode, keyEvent.modifiersEx, false)
+				isCodeEvent(keyEvent) -> KeyStroke.getKeyStroke(keyEvent.keyCode, keyEvent.modifiersEx, false)
-				else                                        -> return this
+				else                  -> return this
 			}
 			
 			return keys[keyStroke] ?: this
 		}
 		
+		private fun isCharEvent(keyEvent: KeyEvent): Boolean {
+			return keyEvent.keyChar != KeyEvent.CHAR_UNDEFINED && (keyEvent.modifiersEx and KeyEvent.CTRL_DOWN_MASK) == 0
+		}
+		
+		private fun isCodeEvent(keyEvent: KeyEvent): Boolean {
+			return keyEvent.id == KeyEvent.KEY_PRESSED
+		}
+		
 		operator fun plus(other: Parent<T>): Parent<T> {
 			val mergedKeys = HashMap(keys)
 			
@@ -59,7 +67,7 @@ internal interface KeyStrokeNode<T> {
 		override fun performAction(holder: T, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
 			val action = actionEvent.actionManager.getAction(name) ?: return
 			
-			val dataContext = CustomizedDataContext.create(actionEvent.dataContext) {
+			val dataContext = CustomizedDataContext.withProvider(actionEvent.dataContext) {
 				when {
 					PlatformDataKeys.CONTEXT_COMPONENT.`is`(it) -> holder.component
 					else                                        -> null

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

@@ -1,19 +0,0 @@
-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?) {}
-}

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

@@ -6,11 +6,15 @@ import com.chylex.intellij.keyboardmaster.feature.vimNavigation.components.VimTa
 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.openapi.ui.getUserData
+import com.intellij.openapi.ui.popup.util.PopupUtil
+import com.intellij.openapi.ui.putUserData
+import com.intellij.openapi.util.Key
 import com.intellij.util.ui.StartupUiUtil
 import java.awt.AWTEvent
 import java.awt.event.FocusEvent
 import java.util.concurrent.atomic.AtomicBoolean
+import javax.swing.JComponent
 import javax.swing.JList
 import javax.swing.JTable
 import javax.swing.JTree
@@ -18,18 +22,22 @@ import javax.swing.KeyStroke
 import javax.swing.UIManager
 
 object VimNavigation {
-	private val isEnabled = AtomicBoolean(false)
+	private val KEY_INSTALLED = Key.create<Boolean>("KeyboardMaster-VimNavigation-Installed")
+	
+	private val isEnabledFlag = AtomicBoolean(false)
 	private var originalPopupBindings: Array<*>? = null
 	
+	val isEnabled
+		get() = isEnabledFlag.get()
+	
 	fun register() {
 		val disposable = ApplicationManager.getApplication().getService(PluginDisposableService::class.java)
 		
-		StartupUiUtil.addAwtListener(::handleEvent, AWTEvent.FOCUS_EVENT_MASK, disposable)
+		StartupUiUtil.addAwtListener(AWTEvent.FOCUS_EVENT_MASK, disposable, ::handleEvent)
-		UiInterceptors.registerPersistent(disposable, PopupInterceptor)
 	}
 	
 	fun setEnabled(enabled: Boolean) {
-		if (!isEnabled.compareAndSet(!enabled, enabled)) {
+		if (!isEnabledFlag.compareAndSet(!enabled, enabled)) {
 			return
 		}
 		
@@ -38,20 +46,11 @@ object VimNavigation {
 				val originalBindings = (UIManager.get("PopupMenu.selectedWindowInputMapBindings") as Array<*>).also { originalPopupBindings = it }
 				val updatedBindings = mutableListOf(*originalBindings)
 				
-				updatedBindings.add(KeyStroke.getKeyStroke('h'))
+				addBinding(updatedBindings, "selectParent", setOf('h', 'p', 'x'))
-				updatedBindings.add("selectParent")
+				addBinding(updatedBindings, "selectNext", setOf('j'))
-				
+				addBinding(updatedBindings, "selectPrevious", setOf('k'))
-				updatedBindings.add(KeyStroke.getKeyStroke('j'))
+				addBinding(updatedBindings, "selectChild", setOf('l', 'o'))
-				updatedBindings.add("selectNext")
+				addBinding(updatedBindings, "cancel", setOf('q'))
-				
-				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())
 				UISettings.getInstance().disableMnemonics = true
@@ -62,12 +61,29 @@ object VimNavigation {
 		}
 	}
 	
+	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.get()) {
+		if (event is FocusEvent && event.id == FocusEvent.FOCUS_GAINED && isEnabled) {
 			when (val source = event.source) {
-				is JList<*> -> VimListNavigation.install(source)
+				is JList<*> -> installTo(source, VimListNavigation::install)
-				is JTree    -> VimTreeNavigation.install(source)
+				is JTree    -> installTo(source, VimTreeNavigation::install)
-				is JTable   -> VimTableNavigation.install(source)
+				is JTable   -> installTo(source, VimTableNavigation::install)
+			}
+		}
+	}
+	
+	private inline fun <T : JComponent> installTo(component: T, installer: (T) -> Unit) {
+		if (component.getUserData(KEY_INSTALLED) == null) {
+			component.putUserData(KEY_INSTALLED, true)
+			
+			if (PopupUtil.getPopupContainerFor(component) == null) {
+				installer(component)
 			}
 		}
 	}

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

@@ -1,29 +1,66 @@
 package com.chylex.intellij.keyboardmaster.feature.vimNavigation
 
-import com.chylex.intellij.keyboardmaster.PluginDisposableService
+import com.chylex.intellij.keyboardmaster.feature.vimNavigation.VimNavigationDispatcher.WrappedAction.ForKeyListener
+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.DataContext
+import com.intellij.openapi.actionSystem.KeyboardShortcut
+import com.intellij.openapi.actionSystem.PlatformCoreDataKeys
+import com.intellij.openapi.actionSystem.ex.ActionUtil
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.DumbAwareAction
-import com.intellij.pom.Navigatable
+import com.intellij.openapi.util.SystemInfo
 import com.intellij.toolWindow.InternalDecoratorImpl
 import com.intellij.ui.SpeedSearchBase
 import com.intellij.ui.speedSearch.SpeedSearch
 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
+import javax.swing.text.JTextComponent
 
-internal open class VimNavigationDispatcher<T : JComponent>(final override val component: T, private val rootNode: KeyStrokeNode.Parent<VimNavigationDispatcher<T>>) : DumbAwareAction(), ComponentHolder {
+internal open class VimNavigationDispatcher<T : JComponent>(final override val component: T, private val rootNode: KeyStrokeNode.Parent<VimNavigationDispatcher<T>>, disposable: Disposable? = null) : DumbAwareAction(), ComponentHolder {
 	companion object {
-		private val DISPOSABLE = ApplicationManager.getApplication().getService(PluginDisposableService::class.java)
+		@JvmStatic
-		private val EXTRA_SHORTCUTS = setOf(
+		protected val ENTER_KEY: KeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0)
-			KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),
+		
-			KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0),
+		private val CTRL_ENTER_KEY: KeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.CTRL_DOWN_MASK)
-		)
+		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? {
@@ -31,29 +68,37 @@ internal open class VimNavigationDispatcher<T : JComponent>(final override val c
 		}
 	}
 	
+	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, EXTRA_SHORTCUTS)
+		return KeyStrokeNode.getAllKeyStrokes(rootNode, setOf(ENTER_KEY, CTRL_ENTER_KEY, META_ENTER_KEY))
+	}
+	
+	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 && handleSpecialKeyPress(keyEvent, e.dataContext)) {
+		if (keyEvent.id == KeyEvent.KEY_PRESSED && keyEvent.keyCode == KeyEvent.VK_ENTER) {
-			currentNode = rootNode
+			handleEnterKeyPress(e, keyEvent)
 			return
 		}
 		
@@ -66,39 +111,73 @@ internal open class VimNavigationDispatcher<T : JComponent>(final override val c
 		}
 	}
 	
-	private fun handleSpecialKeyPress(keyEvent: KeyEvent, dataContext: DataContext): Boolean {
+	private fun handleEnterKeyPress(actionEvent: AnActionEvent, keyEvent: KeyEvent) {
-		if (keyEvent.keyCode == KeyEvent.VK_ESCAPE) {
+		handleEnterKeyPress(keyEvent) { originalEnterAction.perform(actionEvent, it) }
-			return true
-		}
-		
-		if (keyEvent.keyCode == KeyEvent.VK_ENTER) {
-			handleEnterKeyPress(dataContext)
-			return true
-		}
-		
-		return false
 	}
 	
-	private fun handleEnterKeyPress(dataContext: DataContext) {
+	protected inline fun handleEnterKeyPress(keyEvent: KeyEvent, originalAction: (KeyEvent) -> Unit) {
-		if (isSearching.compareAndSet(true, false)) {
+		if (isSearching.compareAndSet(true, false) && !runEnterActionImmediately(keyEvent)) {
-			when (val supply = SpeedSearchSupply.getSupply(component)) {
+			stopSpeedSearch()
-				is SpeedSearchBase<*> -> supply.hidePopup()
-				is SpeedSearch        -> supply.reset()
-			}
 		}
 		else {
-			val navigatables = dataContext.getData(CommonDataKeys.NAVIGATABLE_ARRAY)?.filter(Navigatable::canNavigate).orEmpty()
+			currentNode = rootNode
-			for ((index, navigatable) in navigatables.withIndex()) {
+			originalAction(keyEvent)
-				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 = !isSearching.get() || e.inputEvent.let { it is KeyEvent && it.id == KeyEvent.KEY_PRESSED && it.keyCode == KeyEvent.VK_ENTER }
+		if (!isSearching.get() && SpeedSearchSupply.getSupply(component)?.isPopupActive == true) {
+			isSearching.set(true)
+		}
+		
+		e.presentation.isEnabled = !ignoreEventDueToActiveSearch(e) && !ignoreEventDueToActiveEditing(e)
+	}
+	
+	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.getData(CommonDataKeys.EDITOR) != null
+			|| e.getData(PlatformCoreDataKeys.CONTEXT_COMPONENT) is JTextComponent
 	}
 	
 	final override fun getActionUpdateThread(): ActionUpdateThread {
-		return ActionUpdateThread.BGT
+		return ActionUpdateThread.EDT
+	}
+	
+	private sealed interface WrappedAction {
+		fun perform(actionEvent: AnActionEvent, keyEvent: KeyEvent)
+		
+		class ForActionListener(private val component: JComponent, private val listener: ActionListener) : WrappedAction {
+			override fun perform(actionEvent: AnActionEvent, keyEvent: KeyEvent) {
+				listener.actionPerformed(ActionEvent(component, ActionEvent.ACTION_PERFORMED, "Enter", keyEvent.`when`, keyEvent.modifiersEx))
+			}
+		}
+		
+		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)
+			}
+		}
 	}
 }

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

@@ -1,5 +1,6 @@
 package com.chylex.intellij.keyboardmaster.feature.vimNavigation.components
 
+import com.chylex.intellij.keyboardmaster.feature.vimNavigation.KeyStrokeNode
 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
@@ -8,10 +9,14 @@ import com.chylex.intellij.keyboardmaster.feature.vimNavigation.VimNavigationDis
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.wm.ToolWindowId
 import com.intellij.openapi.wm.ex.ToolWindowManagerEx
+import com.intellij.ui.ComponentUtil
 import com.intellij.ui.speedSearch.SpeedSearchActivator
 import com.intellij.ui.speedSearch.SpeedSearchSupply
+import java.awt.Point
 import java.awt.event.KeyEvent
 import javax.swing.JComponent
+import javax.swing.JScrollPane
+import javax.swing.JViewport
 import javax.swing.KeyStroke
 
 internal object VimCommonNavigation {
@@ -28,6 +33,12 @@ internal object VimCommonNavigation {
 		)
 	)
 	
+	inline fun <T> withShiftModifier(keyCode: Int, modifiers: Int, constructor: (Boolean) -> KeyStrokeNode<T>): Array<Pair<KeyStroke, KeyStrokeNode<T>>> {
+		return arrayOf(
+			KeyStroke.getKeyStroke(keyCode, modifiers) to constructor(false),
+			KeyStroke.getKeyStroke(keyCode, modifiers or KeyEvent.SHIFT_DOWN_MASK) to constructor(true),
+		)
+	}
 	
 	private class StartSearch<T : JComponent> : ActionNode<VimNavigationDispatcher<T>> {
 		@Suppress("UnstableApiUsage")
@@ -63,4 +74,25 @@ internal object VimCommonNavigation {
 			}
 		}
 	}
+	
+	fun JComponent.findScrollPane(): JScrollPane? {
+		return ComponentUtil.getParentOfType(JScrollPane::class.java, this)
+	}
+	
+	fun JScrollPane.scrollByPages(pages: Float) {
+		scrollBy(this) { (it.height.toFloat() * pages).toInt() }
+	}
+	
+	fun JScrollPane.scrollBy(amount: Int) {
+		scrollBy(this) { amount }
+	}
+	
+	private inline fun scrollBy(scrollPane: JScrollPane, amount: (JViewport) -> Int) {
+		val viewport = scrollPane.viewport
+		
+		val position = viewport.viewPosition
+		val scrollTo = (position.y + amount(viewport)).coerceIn(0, viewport.viewSize.height - viewport.height)
+		
+		viewport.viewPosition = Point(position.x, scrollTo)
+	}
 }

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

@@ -1,13 +1,20 @@
 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.components.VimCommonNavigation.findScrollPane
+import com.chylex.intellij.keyboardmaster.feature.vimNavigation.components.VimCommonNavigation.scrollBy
+import com.chylex.intellij.keyboardmaster.feature.vimNavigation.components.VimCommonNavigation.scrollByPages
+import com.chylex.intellij.keyboardmaster.feature.vimNavigation.components.VimCommonNavigation.withShiftModifier
+import com.intellij.openapi.actionSystem.AnActionEvent
 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
@@ -21,16 +28,28 @@ internal object VimListNavigation {
 	
 	private val ROOT_NODE = VimCommonNavigation.commonRootNode<JList<*>>() + Parent(
 		mapOf(
-			KeyStroke.getKeyStroke('g') to Parent(
+			KeyStroke.getKeyStroke('g') to IdeaAction("List-selectFirstRow"),
-				mapOf(
-					KeyStroke.getKeyStroke('g') to IdeaAction("List-selectFirstRow"),
-				)
-			),
 			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"),
+			*withShiftModifier(KeyEvent.VK_B, KeyEvent.CTRL_DOWN_MASK) { ScrollVerticallyAndSelect(pages = -1.0F, extendSelection = it) },
+			*withShiftModifier(KeyEvent.VK_D, KeyEvent.CTRL_DOWN_MASK) { ScrollVerticallyAndSelect(pages = +0.5F, extendSelection = it) },
+			*withShiftModifier(KeyEvent.VK_F, KeyEvent.CTRL_DOWN_MASK) { ScrollVerticallyAndSelect(pages = +1.0F, extendSelection = it) },
+			*withShiftModifier(KeyEvent.VK_U, KeyEvent.CTRL_DOWN_MASK) { ScrollVerticallyAndSelect(pages = -0.5F, extendSelection = it) },
+		)
+	)
+	
+	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"),
 		)
 	)
 	
@@ -46,8 +65,37 @@ internal object VimListNavigation {
 		}
 	}
 	
+	private data class ScrollVerticallyAndSelect(private val pages: Float, private val extendSelection: Boolean) : ActionNode<VimNavigationDispatcher<JList<*>>> {
+		override fun performAction(holder: VimNavigationDispatcher<JList<*>>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
+			val list = holder.component
+			val scrollPane = list.findScrollPane() ?: return
+			
+			scrollPane.scrollByPages(pages)
+			
+			if (pages < 0F) {
+				val topItemBounds = list.firstVisibleIndex.let { list.getCellBounds(it, it) } ?: return
+				scrollPane.scrollBy(topItemBounds.height - 1)
+			}
+			
+			val topItemIndex = list.firstVisibleIndex
+			if (topItemIndex == -1) {
+				return
+			}
+			
+			if (extendSelection) {
+				val anchor = list.anchorSelectionIndex.takeIf { it in 0 until list.model.size } ?: 0
+				list.setSelectionInterval(anchor, topItemIndex)
+			}
+			else {
+				list.selectedIndex = topItemIndex
+			}
+			
+			list.ensureIndexIsVisible(topItemIndex)
+		}
+	}
+	
 	@Suppress("serial")
-	private class VimPopupListNavigationDispatcher(component: JList<*>, override val popup: WizardPopup) : VimNavigationDispatcher<JList<*>>(component, ROOT_NODE) {
+	private class VimPopupListNavigationDispatcher(component: JList<*>, override val popup: WizardPopup) : VimNavigationDispatcher<JList<*>>(component, POPUP_LIST_ROOT_NODE, popup.parent) {
 		init {
 			val speedSearch = SpeedSearchSupply.getSupply(component, true) as? SpeedSearch
 			if (speedSearch != null) {
@@ -73,6 +121,24 @@ 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

@@ -1,11 +1,19 @@
 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.components.VimCommonNavigation.findScrollPane
+import com.chylex.intellij.keyboardmaster.feature.vimNavigation.components.VimCommonNavigation.scrollBy
+import com.chylex.intellij.keyboardmaster.feature.vimNavigation.components.VimCommonNavigation.scrollByPages
+import com.chylex.intellij.keyboardmaster.feature.vimNavigation.components.VimCommonNavigation.withShiftModifier
+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.Rectangle
+import java.awt.event.KeyEvent
 import javax.swing.JTable
 import javax.swing.KeyStroke
 
@@ -14,16 +22,20 @@ internal object VimTableNavigation {
 	
 	private val ROOT_NODE = VimCommonNavigation.commonRootNode<JTable>() + Parent(
 		mapOf(
-			KeyStroke.getKeyStroke('g') to Parent(
+			KeyStroke.getKeyStroke('g') to IdeaAction("Table-selectFirstRow"),
-				mapOf(
-					KeyStroke.getKeyStroke('g') to IdeaAction("Table-selectFirstRow"),
-				)
-			),
 			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"),
+			*withShiftModifier(KeyEvent.VK_B, KeyEvent.CTRL_DOWN_MASK) { ScrollVerticallyAndSelect(pages = -1.0F, extendSelection = it) },
+			*withShiftModifier(KeyEvent.VK_D, KeyEvent.CTRL_DOWN_MASK) { ScrollVerticallyAndSelect(pages = +0.5F, extendSelection = it) },
+			*withShiftModifier(KeyEvent.VK_F, KeyEvent.CTRL_DOWN_MASK) { ScrollVerticallyAndSelect(pages = +1.0F, extendSelection = it) },
+			*withShiftModifier(KeyEvent.VK_U, KeyEvent.CTRL_DOWN_MASK) { ScrollVerticallyAndSelect(pages = -0.5F, extendSelection = it) },
 		)
 	)
 	
@@ -32,4 +44,29 @@ internal object VimTableNavigation {
 			component.putUserData(KEY, VimNavigationDispatcher(component, ROOT_NODE))
 		}
 	}
+	
+	private data class ScrollVerticallyAndSelect(private val pages: Float, private val extendSelection: Boolean) : ActionNode<VimNavigationDispatcher<JTable>> {
+		override fun performAction(holder: VimNavigationDispatcher<JTable>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
+			val table = holder.component
+			val scrollPane = table.findScrollPane() ?: return
+			
+			scrollPane.scrollByPages(pages)
+			
+			if (pages < 0F) {
+				scrollPane.scrollBy(table.rowHeight - 1)
+			}
+			
+			val visibleRect = table.visibleRect
+			val rowIndexToSelect = table.rowAtPoint(visibleRect.location)
+			if (rowIndexToSelect == -1) {
+				return
+			}
+			
+			val rowRect = table.getCellRect(rowIndexToSelect, 0, true)
+			val adjustedRect = Rectangle(visibleRect.x, rowRect.y, visibleRect.width, visibleRect.height)
+			
+			table.changeSelection(rowIndexToSelect, table.selectedColumn, false, extendSelection)
+			table.scrollRectToVisible(adjustedRect)
+		}
+	}
 }

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

@@ -4,37 +4,61 @@ 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.components.VimCommonNavigation.findScrollPane
+import com.chylex.intellij.keyboardmaster.feature.vimNavigation.components.VimCommonNavigation.scrollBy
+import com.chylex.intellij.keyboardmaster.feature.vimNavigation.components.VimCommonNavigation.scrollByPages
+import com.chylex.intellij.keyboardmaster.feature.vimNavigation.components.VimCommonNavigation.withShiftModifier
 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.TreeModel
+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(
 		mapOf(
+			KeyStroke.getKeyStroke('a') to Parent(
+				mapOf(
+					KeyStroke.getKeyStroke('o') to ExpandAll,
+					KeyStroke.getKeyStroke('x') to CollapseAll,
+				)
+			),
 			KeyStroke.getKeyStroke('g') to Parent(
 				mapOf(
 					KeyStroke.getKeyStroke('g') to IdeaAction("Tree-selectFirst"),
+					KeyStroke.getKeyStroke('j') to IdeaAction("Tree-selectNextSibling"),
+					KeyStroke.getKeyStroke('k') to IdeaAction("Tree-selectPreviousSibling"),
 				)
 			),
 			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('o') to ExpandOrCollapseTreeNode,
+			KeyStroke.getKeyStroke('L') to ExpandUntilFirstLeafNode,
+			KeyStroke.getKeyStroke('o') to ExpandChildrenToNextLevel,
 			KeyStroke.getKeyStroke('O') to IdeaAction("FullyExpandTreeNode"),
 			KeyStroke.getKeyStroke('p') to IdeaAction("Tree-selectParentNoCollapse"),
 			KeyStroke.getKeyStroke('P') to IdeaAction("Tree-selectFirst"),
-			KeyStroke.getKeyStroke('x') to CollapseSelfOrParentNode,
+			KeyStroke.getKeyStroke('s') to SelectFirstSibling,
-			KeyStroke.getKeyStroke('X') to IdeaAction("CollapseTreeNode"),
+			KeyStroke.getKeyStroke('S') to SelectLastSibling,
+			KeyStroke.getKeyStroke('x') to CollapseChildrenToPreviousLevel,
+			KeyStroke.getKeyStroke('X') to CollapseSelf,
+			*withShiftModifier(KeyEvent.VK_B, KeyEvent.CTRL_DOWN_MASK) { ScrollVerticallyAndSelect(pages = -1.0F, extendSelection = it) },
+			*withShiftModifier(KeyEvent.VK_D, KeyEvent.CTRL_DOWN_MASK) { ScrollVerticallyAndSelect(pages = +0.5F, extendSelection = it) },
+			*withShiftModifier(KeyEvent.VK_F, KeyEvent.CTRL_DOWN_MASK) { ScrollVerticallyAndSelect(pages = +1.0F, extendSelection = it) },
+			*withShiftModifier(KeyEvent.VK_U, KeyEvent.CTRL_DOWN_MASK) { ScrollVerticallyAndSelect(pages = -0.5F, extendSelection = it) },
 		)
 	)
 	
@@ -44,34 +68,204 @@ internal object VimTreeNavigation {
 		}
 	}
 	
-	private data object ExpandOrCollapseTreeNode : ActionNode<VimNavigationDispatcher<JTree>> {
+	private data class ScrollVerticallyAndSelect(private val pages: Float, private val extendSelection: Boolean) : ActionNode<VimNavigationDispatcher<JTree>> {
+		override fun performAction(holder: VimNavigationDispatcher<JTree>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
+			val tree = holder.component
+			val scrollPane = tree.findScrollPane() ?: return
+			
+			scrollPane.scrollByPages(pages)
+			
+			if (pages < 0F) {
+				val topPath = pathOnTop(tree) ?: return
+				val topPathBounds = tree.getPathBounds(topPath) ?: return
+				scrollPane.scrollBy(topPathBounds.height - 1)
+			}
+			
+			val pathToSelect = pathOnTop(tree) ?: return
+			
+			if (extendSelection) {
+				val anchor = tree.anchorSelectionPath
+				val anchorRow = if (anchor == null) -1 else tree.getRowForPath(anchor)
+				if (anchorRow < 0) {
+					tree.selectionPath = pathToSelect
+				}
+				else {
+					tree.setSelectionInterval(tree.getRowForPath(pathToSelect), anchorRow)
+					tree.setAnchorSelectionPath(anchor)
+					tree.leadSelectionPath = pathToSelect
+				}
+			}
+			else {
+				tree.selectionPath = pathToSelect
+			}
+			
+			tree.scrollRectToVisible(tree.getPathBounds(pathToSelect))
+		}
+		
+		private fun pathOnTop(tree: JTree): TreePath? {
+			return tree.visibleRect.let { tree.getClosestPathForLocation(it.x, it.y) }
+		}
+	}
+	
+	private data object CollapseSelf : ActionNode<VimNavigationDispatcher<JTree>> {
+		override fun performAction(holder: VimNavigationDispatcher<JTree>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
+			val tree = holder.component
+			val path = tree.selectionPath ?: return
+			
+			collapseAndScroll(tree, path)
+		}
+	}
+	
+	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)) {
-				tree.collapsePath(path)
+				collapseAndScroll(tree, path)
 			}
 			else {
-				tree.expandPath(path)
+				withParentPath(tree, path) { selectRow(tree, it) }
 			}
 		}
 	}
 	
-	private data object CollapseSelfOrParentNode : ActionNode<VimNavigationDispatcher<JTree>> {
+	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
 			
-			if (tree.isExpanded(path)) {
+			var parentPath = path
-				tree.collapsePath(path)
+			
+			while (true) {
+				parentPath = parentPath.parentPath.takeUnless { isInvisibleRoot(tree, it) } ?: break
 			}
-			else {
+			
-				val parentPath = path.parentPath
+			collapseAndScroll(tree, parentPath)
-				if (parentPath.parentPath != null || tree.isRootVisible) {
+		}
-					tree.collapsePath(parentPath)
+	}
+	
+	private data object CollapseAll : ActionNode<VimNavigationDispatcher<JTree>> {
+		override fun performAction(holder: VimNavigationDispatcher<JTree>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
+			val tree = holder.component
+			
+			var row = 0
+			
+			while (row < tree.rowCount) {
+				tree.collapseRow(row)
+				row++
+			}
+		}
+	}
+	
+	private data object CollapseChildrenToPreviousLevel : 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?.takeIf(tree::isExpanded) ?: return
+			
+			var currentLevel = mutableListOf(path)
+			
+			while (true) {
+				val nextLevel = mutableListOf<TreePath>()
+				
+				for (parentPath in currentLevel) {
+					forEachChild(model, parentPath) {
+						val childPath = parentPath.pathByAddingChild(it)
+						if (tree.isExpanded(childPath)) {
+							nextLevel.add(childPath)
+						}
+					}
+				}
+				
+				if (nextLevel.isNotEmpty()) {
+					currentLevel = nextLevel
+				}
+				else {
+					break
 				}
 			}
+			
+			for (parentPath in currentLevel) {
+				tree.collapsePath(parentPath)
+			}
+		}
+	}
+	
+	private data object ExpandAll : ActionNode<VimNavigationDispatcher<JTree>> {
+		override fun performAction(holder: VimNavigationDispatcher<JTree>, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
+			val tree = holder.component
+			
+			var row = 0
+			
+			while (row < tree.rowCount) {
+				tree.expandRow(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) }
+					
+					for (path in pathsToExpand) {
+						forEachChild(model, path) { tree.collapsePath(path.pathByAddingChild(it)) }
+					}
+					
+					break
+				}
+				
+				val nextPathsToExpand = mutableListOf<TreePath>()
+				
+				for (parentPath in pathsToExpand) {
+					forEachChild(model, parentPath) {
+						if (!model.isLeaf(it)) {
+							nextPathsToExpand.add(parentPath.pathByAddingChild(it))
+						}
+					}
+				}
+				
+				pathsToExpand = nextPathsToExpand
+			} while (pathsToExpand.isNotEmpty())
+		}
+	}
+	
+	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)
 		}
 	}
 	
@@ -83,7 +277,7 @@ internal object VimTreeNavigation {
 			val parentPath = path.parentPath ?: return
 			val parentRow = tree.getRowForPath(parentPath)
 			
-			tree.setSelectionRow(parentRow + 1)
+			selectRow(tree, parentRow + 1)
 		}
 	}
 	
@@ -109,7 +303,58 @@ internal object VimTreeNavigation {
 				}
 			}
 			
-			tree.setSelectionRow(targetRow)
+			selectRow(tree, targetRow)
 		}
 	}
+	
+	private inline fun forEachChild(model: TreeModel, path: TreePath, action: (Any) -> Unit) {
+		val lastPathComponent = path.lastPathComponent
+		
+		for (i in 0 until model.getChildCount(lastPathComponent)) {
+			action(model.getChild(lastPathComponent, i))
+		}
+	}
+	
+	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.scrollPathToVisible(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)
+	}
 }