Release version 0.6.2

.gitignore

@@ -1,8 +1,5 @@
-/.idea/dictionaries
-/.idea/inspectionProfiles
-/.idea/jarRepositories.xml
-/.idea/misc.xml
-/.idea/*.iml
+/.idea/*
+!/.idea/runConfigurations
 
 /.gradle/
 /build/

.idea/.gitignore

@@ -1,5 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/

.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>

.idea/encodings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>

.idea/gradle.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="delegatedBuild" value="true" />
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GitSharedSettings">
-    <option name="FORCE_PUSH_PROHIBITED_PATTERNS">
-      <list />
-    </option>
-  </component>
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

build.gradle.kts

@@ -1,31 +1,49 @@
+@file:Suppress("ConvertLambdaToReference")
+
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-	kotlin("jvm") version "1.5.10"
-	id("org.jetbrains.intellij") version "1.2.0"
+	kotlin("jvm") version "1.9.22"
+	id("org.jetbrains.intellij") version "1.17.3"
 }
 
 group = "com.chylex.intellij.keyboardmaster"
-version = "0.2.1"
+version = "0.6.2"
 
 repositories {
 	mavenCentral()
 }
 
-dependencies {
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.0")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-}
-
 intellij {
-    version.set("2021.2.2")
+	type.set("IU")
+	version.set("2024.2")
 	updateSinceUntilBuild.set(false)
 	
+	plugins.add("com.intellij.java")
+	
 	if (System.getenv("IDEAVIM") == "1") {
-		plugins.add("IdeaVIM:0.66")
+		plugins.add("IdeaVIM:2.10.2")
 	}
 }
 
-tasks.withType<KotlinCompile> {
-	kotlinOptions.jvmTarget = "11"
+kotlin {
+	jvmToolchain(17)
+}
+
+dependencies {
+	testImplementation("org.junit.jupiter:junit-jupiter:5.11.0-M1")
+}
+
+tasks.patchPluginXml {
+	sinceBuild.set("242")
+}
+
+tasks.test {
+	useJUnitPlatform()
+}
+
+tasks.withType<KotlinCompile> {
+	kotlinOptions.freeCompilerArgs = listOf(
+		"-Xjvm-default=all"
+	)
 }

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,99 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       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
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# 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"'
+# This is normally unused
+# 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
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+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
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+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;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/main/kotlin/com/chylex/intellij/keyboardmaster/PluginDisposableService.kt

@@ -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() {}
+}

src/main/kotlin/com/chylex/intellij/keyboardmaster/PluginStartup.kt

@@ -1,24 +1,33 @@
 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.vimNavigation.VimNavigation
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupActivity
+import com.intellij.openapi.startup.ProjectActivity
 
-class PluginStartup : StartupActivity.DumbAware {
+class PluginStartup : ProjectActivity {
 	private var isInitialized = false
 	
-	override fun runActivity(project: Project) {
+	override suspend fun execute(project: Project) {
 		if (!isInitialized) {
 			isInitialized = true
 			
+			PluginConfiguration.load()
+			
 			val application = ApplicationManager.getApplication()
 			if (application.isUnitTestMode) {
-				CodeCompletionPopupKeyHandler.registerRawHandler()
+				initialize()
 			}
 			else {
-				application.invokeLater(CodeCompletionPopupKeyHandler.Companion::registerRawHandler)
+				application.invokeLater(::initialize)
 			}
 		}
 	}
+	
+	private fun initialize() {
+		CodeCompletionPopupKeyHandler.registerRawHandler()
+		VimNavigation.register()
+	}
 }

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

@@ -1,8 +1,10 @@
 package com.chylex.intellij.keyboardmaster.configuration
 
 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.layout.panel
+import com.intellij.ui.dsl.builder.panel
 import javax.swing.JComponent
 
 class PluginConfigurable : Configurable {
@@ -12,16 +14,28 @@ class PluginConfigurable : Configurable {
 	private val codeCompletionNextPageShortcut = 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 fully disabled after restarting the IDE.", "Keyboard Master")
+			}
+		}
+	}
+	
 	override fun getDisplayName(): String {
 		return "Keyboard Master"
 	}
 	
 	override fun createComponent(): JComponent {
 		component = panel {
-			titledRow("Code Completion") {
-				row("Item shortcuts:") { component(codeCompletionItemShortcuts) }
-				row("Next page shortcut:") { component(codeCompletionNextPageShortcut) }
-				row("Prev page shortcut:") { component(codeCompletionPrevPageShortcut) }
+			group("Code Completion") {
+				row("Item shortcuts:") { cell(codeCompletionItemShortcuts) }
+				row("Next page shortcut:") { cell(codeCompletionNextPageShortcut) }
+				row("Prev page shortcut:") { cell(codeCompletionPrevPageShortcut) }
+			}
+			
+			group("Navigation") {
+				row { cell(enableVimNavigation) }
 			}
 		}
 		
@@ -37,6 +51,8 @@ class PluginConfigurable : Configurable {
 			it.codeCompletionItemShortcuts = codeCompletionItemShortcuts.text
 			it.codeCompletionNextPageShortcut = codeCompletionNextPageShortcut.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
 			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() }
+			
+			enableVimNavigation.isSelected = it.enableVimNavigation
 		}
 	}
 }

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

@@ -1,6 +1,7 @@
 package com.chylex.intellij.keyboardmaster.configuration
 
 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.components.PersistentStateComponent
 import com.intellij.openapi.components.State
@@ -16,6 +17,8 @@ class PluginConfiguration : PersistentStateComponent<PluginConfiguration> {
 	var codeCompletionNextPageShortcut: Int = '0'.code
 	var codeCompletionPrevPageShortcut: Int = 0
 	
+	var enableVimNavigation = false
+	
 	companion object {
 		private val instance: PluginConfiguration
 			get() = ApplicationManager.getApplication().getService(PluginConfiguration::class.java)
@@ -34,6 +37,7 @@ class PluginConfiguration : PersistentStateComponent<PluginConfiguration> {
 		
 		private fun update(instance: PluginConfiguration) = with(instance) {
 			CodeCompletionPopupConfiguration.updateShortcuts(codeCompletionItemShortcuts, codeCompletionNextPageShortcut, codeCompletionPrevPageShortcut)
+			VimNavigation.setEnabled(enableVimNavigation)
 		}
 	}
 	

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

@@ -0,0 +1,21 @@
+package com.chylex.intellij.keyboardmaster.feature.action.gotoError
+
+import com.intellij.codeInsight.daemon.DaemonCodeAnalyzerSettings
+import com.intellij.codeInsight.daemon.impl.GotoNextErrorHandler
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiFile
+
+class GotoErrorInOtherModeHandler(forward: Boolean) : GotoNextErrorHandler(forward) {
+	override fun invoke(project: Project, editor: Editor, file: PsiFile) {
+		val settings = DaemonCodeAnalyzerSettings.getInstance()
+		val oldMode = settings.isNextErrorActionGoesToErrorsFirst
+		
+		settings.isNextErrorActionGoesToErrorsFirst = !oldMode
+		try {
+			super.invoke(project, editor, file)
+		} finally {
+			settings.isNextErrorActionGoesToErrorsFirst = oldMode
+		}
+	}
+}

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

@@ -0,0 +1,11 @@
+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 {
+		return GotoErrorInOtherModeHandler(forward = true)
+	}
+}

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

@@ -0,0 +1,11 @@
+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 {
+		return GotoErrorInOtherModeHandler(forward = false)
+	}
+}

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

@@ -0,0 +1,34 @@
+package com.chylex.intellij.keyboardmaster.feature.action.gotoType
+
+import com.intellij.codeInsight.actions.BaseCodeInsightAction
+import com.intellij.ide.structureView.TreeBasedStructureViewBuilder
+import com.intellij.lang.LanguageStructureViewBuilder
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.project.DumbAware
+import com.intellij.openapi.project.IndexNotReadyException
+import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiFile
+
+abstract class AbstractGotoTypeInFileAction : BaseCodeInsightAction(), DumbAware {
+	init {
+		isEnabledInModalContext = true
+	}
+	
+	final override fun isValidForLookup(): Boolean {
+		return true
+	}
+	
+	final override fun isValidForFile(project: Project, editor: Editor, file: PsiFile): Boolean {
+		return checkValidForFile(file)
+	}
+	
+	private companion object {
+		fun checkValidForFile(file: PsiFile): Boolean {
+			return try {
+				LanguageStructureViewBuilder.INSTANCE.getStructureViewBuilder(file) is TreeBasedStructureViewBuilder
+			} catch (e: IndexNotReadyException) {
+				false
+			}
+		}
+	}
+}

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

@@ -0,0 +1,9 @@
+package com.chylex.intellij.keyboardmaster.feature.action.gotoType
+
+import com.intellij.codeInsight.CodeInsightActionHandler
+
+class GotoNextTypeInFileAction : AbstractGotoTypeInFileAction() {
+	override fun getHandler(): CodeInsightActionHandler {
+		return GotoTypeInFileHandler(forward = true)
+	}
+}

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

@@ -0,0 +1,9 @@
+package com.chylex.intellij.keyboardmaster.feature.action.gotoType
+
+import com.intellij.codeInsight.CodeInsightActionHandler
+
+class GotoPreviousTypeInFileAction : AbstractGotoTypeInFileAction() {
+	override fun getHandler(): CodeInsightActionHandler {
+		return GotoTypeInFileHandler(forward = false)
+	}
+}

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

@@ -0,0 +1,97 @@
+package com.chylex.intellij.keyboardmaster.feature.action.gotoType
+
+import com.intellij.codeInsight.CodeInsightActionHandler
+import com.intellij.codeInsight.lookup.LookupManager
+import com.intellij.ide.structureView.StructureViewTreeElement
+import com.intellij.ide.structureView.TreeBasedStructureViewBuilder
+import com.intellij.lang.LanguageStructureViewBuilder
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.editor.ScrollType
+import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.Disposer
+import com.intellij.psi.PsiClass
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiFile
+import it.unimi.dsi.fastutil.ints.IntArrayList
+
+class GotoTypeInFileHandler(private val forward: Boolean) : CodeInsightActionHandler {
+	override fun invoke(project: Project, editor: Editor, file: PsiFile) {
+		LookupManager.getInstance(project).hideActiveLookup()
+		
+		val caretOffset = editor.caretModel.offset
+		val caretLine = editor.caretModel.logicalPosition.line
+		
+		val searchedOffsetRange = if (forward)
+			caretOffset + 1..file.textLength
+		else
+			0 until caretOffset
+		
+		val navigationOffsets = getNavigationOffsets(file, searchedOffsetRange)
+		if (!forward) {
+			navigationOffsets.reverse()
+		}
+		
+		val direction = if (forward) 1 else -1
+		for (offset in navigationOffsets) {
+			val line = editor.offsetToLogicalPosition(offset).line
+			if (line.compareTo(caretLine) * direction > 0) {
+				editor.caretModel.removeSecondaryCarets()
+				editor.caretModel.moveToOffset(offset)
+				editor.selectionModel.removeSelection()
+				editor.scrollingModel.scrollToCaret(if (forward) ScrollType.CENTER_DOWN else ScrollType.CENTER_UP)
+				IdeDocumentHistory.getInstance(project).includeCurrentCommandAsNavigation()
+				break
+			}
+		}
+	}
+	
+	override fun getElementToMakeWritable(currentFile: PsiFile): PsiElement? {
+		return null
+	}
+	
+	private companion object {
+		fun getNavigationOffsets(file: PsiFile, searchedOffsetRange: IntRange): IntArray {
+			val structureViewBuilder = LanguageStructureViewBuilder.getInstance().getStructureViewBuilder(file)
+			if (structureViewBuilder !is TreeBasedStructureViewBuilder) {
+				return intArrayOf()
+			}
+			
+			val elements = mutableSetOf<PsiElement>()
+			val model = structureViewBuilder.createStructureViewModel(null)
+			
+			try {
+				addStructureViewElements(elements, model.root, file)
+			} finally {
+				Disposer.dispose(model)
+			}
+			
+			return offsetsFromElements(elements, searchedOffsetRange)
+		}
+		
+		private fun addStructureViewElements(result: MutableSet<PsiElement>, parent: StructureViewTreeElement, file: PsiFile) {
+			for (child in parent.children) {
+				val value = (child as StructureViewTreeElement).value
+				if (value is PsiClass && file == value.containingFile) {
+					result.add(value)
+				}
+				
+				addStructureViewElements(result, child, file)
+			}
+		}
+		
+		private fun offsetsFromElements(elements: Collection<PsiElement>, searchedOffsetRange: IntRange): IntArray {
+			val offsets = IntArrayList(elements.size)
+			
+			for (element in elements) {
+				val offset = element.textOffset
+				if (offset in searchedOffsetRange) {
+					offsets.add(offset)
+				}
+			}
+			
+			offsets.sort(null)
+			return offsets.toIntArray()
+		}
+	}
+}

src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/actions/NextMenuItemAction.kt

@@ -1,17 +0,0 @@
-package com.chylex.intellij.keyboardmaster.feature.actions
-
-import javax.swing.JList
-import javax.swing.JTree
-
-class NextMenuItemAction : SelectMenuItemBaseAction() {
-	override fun updateSelection(list: JList<*>) {
-		setSelectedIndex(list, list.selectedIndex + 1)
-	}
-	
-	override fun updateSelection(tree: JTree) {
-		val row = tree.selectionRows?.maxOrNull()
-		if (row != null) {
-			setSelectedIndex(tree, row + 1)
-		}
-	}
-}

src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/actions/PrevMenuItemAction.kt

@@ -1,23 +0,0 @@
-package com.chylex.intellij.keyboardmaster.feature.actions
-
-import javax.swing.JList
-import javax.swing.JTree
-
-class PrevMenuItemAction : SelectMenuItemBaseAction() {
-	override fun updateSelection(list: JList<*>) {
-		val index = list.selectedIndex
-		if (index == -1) {
-			setSelectedIndex(list, list.model.size - 1)
-		}
-		else {
-			setSelectedIndex(list, index - 1)
-		}
-	}
-	
-	override fun updateSelection(tree: JTree) {
-		val row = tree.selectionRows?.minOrNull()
-		if (row != null) {
-			setSelectedIndex(tree, row - 1)
-		}
-	}
-}

src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/actions/SelectMenuItemBaseAction.kt

@@ -1,74 +0,0 @@
-package com.chylex.intellij.keyboardmaster.feature.actions
-
-import com.intellij.codeInsight.lookup.LookupManager
-import com.intellij.codeInsight.lookup.impl.LookupImpl
-import com.intellij.ide.actions.BigPopupUI
-import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.actionSystem.CommonDataKeys
-import com.intellij.openapi.project.DumbAwareAction
-import com.intellij.ui.ComponentUtil
-import java.awt.KeyboardFocusManager
-import javax.swing.JList
-import javax.swing.JTree
-
-abstract class SelectMenuItemBaseAction internal constructor(): DumbAwareAction() {
-	init {
-		isEnabledInModalContext = true
-	}
-	
-	final override fun actionPerformed(e: AnActionEvent) {
-		val editor = e.getData(CommonDataKeys.EDITOR)
-		if (editor != null) {
-			val lookup = LookupManager.getActiveLookup(editor)
-			if (lookup is LookupImpl) {
-				updateSelection(lookup.list)
-				return
-			}
-		}
-		
-		var focused = KeyboardFocusManager.getCurrentKeyboardFocusManager().focusOwner
-		while (focused != null) {
-			if (focused is JList<*>) {
-				updateSelection(focused)
-				break
-			}
-			else if (focused is JTree) {
-				updateSelection(focused)
-				break
-			}
-			else if (focused is BigPopupUI) {
-				val list = ComponentUtil.findComponentsOfType(focused, JList::class.java).singleOrNull()
-				if (list != null) {
-					updateSelection(list)
-					break
-				}
-				
-				val tree = ComponentUtil.findComponentsOfType(focused, JTree::class.java).singleOrNull()
-				if (tree != null) {
-					updateSelection(tree)
-					break
-				}
-			}
-			
-			focused = focused.parent
-		}
-	}
-	
-	protected abstract fun updateSelection(list: JList<*>)
-	
-	protected fun setSelectedIndex(list: JList<*>, newIndex: Int) {
-		if (newIndex in 0 until list.model.size) {
-			list.selectedIndex = newIndex
-			list.ensureIndexIsVisible(newIndex)
-		}
-	}
-	
-	protected abstract fun updateSelection(tree: JTree)
-	
-	protected fun setSelectedIndex(list: JTree, newIndex: Int) {
-		if (newIndex in 0 until list.rowCount) {
-			list.setSelectionRow(newIndex)
-			list.scrollRowToVisible(newIndex)
-		}
-	}
-}

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

@@ -1,23 +1,18 @@
 package com.chylex.intellij.keyboardmaster.feature.codeCompletion
 
-import com.chylex.intellij.keyboardmaster.configuration.PluginConfiguration
-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
 		get() = hintTexts.size
 	
-	init {
-		PluginConfiguration.load()
-	}
-	
 	fun updateShortcuts(itemShortcutChars: String, nextPageShortcutCode: Int, previousPageShortcutCode: Int) {
 		charToShortcutMap.clear()
 		

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

@@ -1,10 +1,13 @@
 package com.chylex.intellij.keyboardmaster.feature.codeCompletion
 
 import com.intellij.codeInsight.lookup.Lookup
+import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.codeInsight.lookup.LookupElementPresentation
 import com.intellij.codeInsight.lookup.LookupManagerListener
+import com.intellij.codeInsight.lookup.impl.LookupCellRenderer.ItemPresentationCustomizer
 import com.intellij.codeInsight.lookup.impl.LookupImpl
 import com.intellij.openapi.util.Key
+import javax.swing.Icon
 
 /**
  * Adds hints to code completion popup items with the character that selects the item.
@@ -37,7 +40,8 @@ class CodeCompletionPopupListener : LookupManagerListener {
 		newLookup.putUserData(IS_MODIFIED_KEY, true)
 		
 		@Suppress("UnstableApiUsage")
-		newLookup.addPresentationCustomizer { item, presentation ->
+		newLookup.addPresentationCustomizer(object : ItemPresentationCustomizer {
+			override fun customizePresentation(item: LookupElement, presentation: LookupElementPresentation): LookupElementPresentation {
 				val itemList = newLookup.list.model
 				val itemCount = itemList.size
 				val offset = getPageOffset(newLookup)
@@ -52,11 +56,16 @@ class CodeCompletionPopupListener : LookupManagerListener {
 						val customized = LookupElementPresentation()
 						customized.copyFrom(presentation)
 						customized.appendTailTextItalic(CodeCompletionPopupConfiguration.getHintText(index), true)
-					return@addPresentationCustomizer customized
+						return customized
 					}
 				}
 				
-			presentation
+				return presentation
 			}
+			
+			override fun customizeEmptyIcon(icon: Icon): Icon {
+				return icon
+			}
+		})
 	}
 }

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

@@ -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
+}

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

@@ -0,0 +1,92 @@
+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) {
+					addAll(node.allKeyStrokes)
+				}
+			}
+		}
+		
+		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
+		}
+		
+		operator fun plus(other: Parent<T>): Parent<T> {
+			val mergedKeys = HashMap(keys)
+			
+			for ((otherKey, otherNode) in other.keys) {
+				if (otherNode is Parent) {
+					val ourNode = keys[otherKey]
+					if (ourNode is Parent) {
+						mergedKeys[otherKey] = ourNode + otherNode
+						continue
+					}
+				}
+				
+				mergedKeys[otherKey] = otherNode
+			}
+			
+			return Parent(mergedKeys)
+		}
+	}
+	
+	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.withProvider(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) })
+		}
+	}
+}

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

@@ -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 && VimNavigation.isEnabled) {
+			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

@@ -0,0 +1,75 @@
+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.ide.ui.UISettings
+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 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(AWTEvent.FOCUS_EVENT_MASK, disposable, ::handleEvent)
+		UiInterceptors.registerPersistent(disposable, PopupInterceptor)
+	}
+	
+	fun setEnabled(enabled: Boolean) {
+		if (!isEnabledFlag.compareAndSet(!enabled, enabled)) {
+			return
+		}
+		
+		ApplicationManager.getApplication().invokeLater {
+			if (enabled) {
+				val originalBindings = (UIManager.get("PopupMenu.selectedWindowInputMapBindings") as Array<*>).also { originalPopupBindings = it }
+				val updatedBindings = mutableListOf(*originalBindings)
+				
+				addBinding(updatedBindings, "selectParent", setOf('h', 'p', 'x'))
+				addBinding(updatedBindings, "selectNext", setOf('j'))
+				addBinding(updatedBindings, "selectPrevious", setOf('k'))
+				addBinding(updatedBindings, "selectChild", setOf('l', 'o'))
+				addBinding(updatedBindings, "cancel", setOf('q'))
+				
+				UIManager.put("PopupMenu.selectedWindowInputMapBindings", updatedBindings.toTypedArray())
+				UISettings.getInstance().disableMnemonics = true
+			}
+			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) {
+			when (val source = event.source) {
+				is JList<*> -> VimListNavigation.install(source)
+				is JTree    -> VimTreeNavigation.install(source)
+				is JTable   -> VimTableNavigation.install(source)
+			}
+		}
+	}
+}

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

@@ -0,0 +1,176 @@
+package com.chylex.intellij.keyboardmaster.feature.vimNavigation
+
+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.KeyboardShortcut
+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.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
+
+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 {
+		@JvmStatic
+		protected val ENTER_KEY: KeyStroke = 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? {
+			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)
+		SpeedSearchSupply.getSupply(component, true)?.addChangeListener(::handleSpeedSearchChange)
+	}
+	
+	protected fun getAllKeyStrokes(): Set<KeyStroke> {
+		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 && keyEvent.keyCode == KeyEvent.VK_ENTER) {
+			handleEnterKeyPress(e, keyEvent)
+			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 handleEnterKeyPress(actionEvent: AnActionEvent, keyEvent: KeyEvent) {
+		handleEnterKeyPress(keyEvent) { originalEnterAction.perform(actionEvent, it) }
+	}
+	
+	protected inline fun handleEnterKeyPress(keyEvent: KeyEvent, originalAction: (KeyEvent) -> Unit) {
+		if (isSearching.compareAndSet(true, false) && !runEnterActionImmediately(keyEvent)) {
+			stopSpeedSearch()
+		}
+		else {
+			currentNode = rootNode
+			originalAction(keyEvent)
+		}
+	}
+	
+	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)
+	}
+	
+	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 {
+		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

@@ -0,0 +1,66 @@
+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

@@ -0,0 +1,118 @@
+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.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
+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 = VimCommonNavigation.commonRootNode<JList<*>>() + Parent(
+		mapOf(
+			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('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"),
+		)
+	)
+	
+	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"),
+		)
+	)
+	
+	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, POPUP_LIST_ROOT_NODE, popup.parent) {
+		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)
+			
+			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() {
+			override fun actionPerformed(e: ActionEvent) {
+				if (!dispatcher.isSearching.get()) {
+					speedSearch.setEnabled(false)
+					ApplicationManager.getApplication().invokeLater { speedSearch.setEnabled(true) }
+				}
+			}
+		}
+	}
+}

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

@@ -0,0 +1,39 @@
+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.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 = VimCommonNavigation.commonRootNode<JTable>() + Parent(
+		mapOf(
+			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('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"),
+		)
+	)
+	
+	fun install(component: JTable) {
+		if (component.getUserData(KEY) == null) {
+			component.putUserData(KEY, VimNavigationDispatcher(component, ROOT_NODE))
+		}
+	}
+}

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

@@ -0,0 +1,271 @@
+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.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(
+		mapOf(
+			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('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('l') to ExpandSelfOrMoveToFirstChildNode,
+			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('x') to CollapseSelfOrParentNode,
+			KeyStroke.getKeyStroke('X') to CollapseAll,
+		)
+	)
+	
+	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 {
+				runWithoutAutoExpand(tree) { 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) }
+			}
+		}
+	}
+	
+	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)) {
+				collapseAndScroll(tree, path)
+			}
+			else {
+				withParentPath(tree, path) { collapseAndScroll(tree, it) }
+			}
+		}
+	}
+	
+	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())
+		}
+	}
+	
+	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)
+			
+			selectRow(tree, 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
+				}
+			}
+			
+			selectRow(tree, 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/KeyboardMaster-Java.xml

@@ -0,0 +1,15 @@
+<idea-plugin>
+  <actions>
+    <!-- Go to Type in File -->
+    <action id="KM.GotoNextTypeInFile"
+            text="Next Type"
+            class="com.chylex.intellij.keyboardmaster.feature.action.gotoType.GotoNextTypeInFileAction">
+      <add-to-group group-id="NavigateInFileGroup" anchor="after" relative-to-action="MethodUp" />
+    </action>
+    <action id="KM.GotoPreviousTypeInFile"
+            text="Previous Type"
+            class="com.chylex.intellij.keyboardmaster.feature.action.gotoType.GotoPreviousTypeInFileAction">
+      <add-to-group group-id="NavigateInFileGroup" anchor="after" relative-to-action="KM.GotoNextTypeInFile" />
+    </action>
+  </actions>
+</idea-plugin>

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

@@ -2,17 +2,19 @@
   <id>com.chylex.intellij.keyboardmaster.KeyboardMaster</id>
   <name>Keyboard Master</name>
   <vendor url="https://chylex.com">chylex</vendor>
-  <idea-version since-build="212.5284" />
   
   <description><![CDATA[
     Collection of keyboard-centric additions.
     <ul>
       <li>Code completion items can be jumped to using customizable characters (numbers by default).</li>
-      <li>Keyboard shortcuts to select next/previous item in focused menu.</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>
   ]]></description>
   
   <depends>com.intellij.modules.platform</depends>
+  <depends optional="true" config-file="KeyboardMaster-Java.xml">com.intellij.java</depends>
   
   <projectListeners>
     <listener class="com.chylex.intellij.keyboardmaster.feature.codeCompletion.CodeCompletionPopupListener" topic="com.intellij.codeInsight.lookup.LookupManagerListener" />
@@ -20,12 +22,21 @@
   
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceImplementation="com.chylex.intellij.keyboardmaster.configuration.PluginConfiguration" />
-    <applicationConfigurable parentId="tools" instance="com.chylex.intellij.keyboardmaster.configuration.PluginConfigurable" id="com.chylex.keyboardmaster" />
+    <applicationConfigurable parentId="tools" instance="com.chylex.intellij.keyboardmaster.configuration.PluginConfigurable" id="com.chylex.keyboardmaster" displayName="Keyboard Master" />
     <postStartupActivity implementation="com.chylex.intellij.keyboardmaster.PluginStartup" order="last" />
   </extensions>
   
   <actions>
-    <action id="com.chylex.intellij.keyboardmaster.feature.actions.NextMenuItemAction" class="com.chylex.intellij.keyboardmaster.feature.actions.NextMenuItemAction" text="Next Menu Item" />
-    <action id="com.chylex.intellij.keyboardmaster.feature.actions.PrevMenuItemAction" class="com.chylex.intellij.keyboardmaster.feature.actions.PrevMenuItemAction" text="Previous Menu Item" />
+    <!-- Go to Highlighted Error -->
+    <action id="KM.GotoNextErrorInOtherMode"
+            text="Next Highlighted Error in Other Mode"
+            class="com.chylex.intellij.keyboardmaster.feature.action.gotoError.GotoNextErrorInOtherModeAction">
+      <add-to-group group-id="GoToErrorGroup" anchor="after" relative-to-action="GotoNextError" />
+    </action>
+    <action id="KM.GotoPreviousErrorInOtherMode"
+            text="Previous Highlighted Error in Other Mode"
+            class="com.chylex.intellij.keyboardmaster.feature.action.gotoError.GotoPreviousErrorInOtherModeAction">
+      <add-to-group group-id="GoToErrorGroup" anchor="after" relative-to-action="GotoPreviousError" />
+    </action>
   </actions>
 </idea-plugin>