[WIP] Simplify tags by only tagging if the search query has at 2 or more alnum characters (or other symbols)

See https://github.com/acejump/AceJump/issues/348 for information on what's changed and what more needs to be done.

.gitignore

@@ -1,5 +1,21 @@
-/.idea/*
-!/.idea/runConfigurations
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
 
-/.gradle/
-/build/
+## Directory-based project format:
+.idea
+*.iml
+
+## Plugin-specific files:
+# IntelliJ
+/out/
+
+### Gradle template
+.gradle
+build/
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+gradle.properties
+
+# Mac OS
+.DS_Store

CHANGES.md

@@ -1,17 +1,8 @@
 # Changelog
 
-### 3.7
+### 3.6.4
 
-- Improvements to tag latency
-- Redesign settings panel
-  - Add missing configuration for definition mode color
-  - Adds option to switch between straight and rounded tag corners
-  - Adds option to only consider visible area
-  - Add customizable jump mode cycling 
-- Jump-to-End mode jumps to the end of a word
-- Fixes toggle keys not resetting mode when pressed twice
-- Increase limit for what is considered a large file
-- Thanks to @chylex for [all the PRs](https://github.com/acejump/AceJump/pulls?q=is%3Apr+author%3Achylex)!
+- Improvements to tag latency. Thanks to @chylex for [the PR](https://github.com/acejump/AceJump/pull/339)!
 
 ### 3.6.3
 
@@ -313,4 +304,4 @@
 
 ### 1.0.0
 
-- Cleaned up code base for release
+- Cleaned up code base for release

README.md

@@ -171,7 +171,7 @@ The following individuals have significantly improved AceJump through their cont
 * [John Lindquist](https://github.com/johnlindquist) for creating AceJump and supporting it for many years.
 * [Breandan Considine](https://github.com/breandan) for maintaining the project and adding some new features.
 * [Alex Plate](https://github.com/AlexPl292) for submitting [several PRs](https://github.com/acejump/AceJump/pulls?q=is%3Apr+author%3AAlexPl292).
-* [Daniel Chýlek](https://github.com/chylex) for several [performance optimizations](https://github.com/acejump/AceJump/pulls?q=is%3Apr+author%3Achylex).
+* [Daniel Chýlek](https://github.com/chylex) for several [performance optimizations](https://github.com/acejump/AceJump/pull/339).
 * [Sven Speckmaier](https://github.com/svensp) for [improving](https://github.com/acejump/AceJump/pull/214) search latency.
 * [Stefan Monnier](https://www.iro.umontreal.ca/~monnier/) for algorithmic advice and maintaining Emacs for several years.
 * [Fool's Mate](https://www.fools-mate.de/) for the [icon](https://github.com/acejump/AceJump/issues/313) and graphic design.

build.gradle.kts

@@ -1,54 +1,46 @@
-@file:Suppress("ConvertLambdaToReference")
-
+import org.jetbrains.changelog.closure
+import org.jetbrains.intellij.tasks.PatchPluginXmlTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-  kotlin("jvm") version "1.9.10"
-  id("org.jetbrains.intellij") version "1.17.3"
+  idea apply true
+  kotlin("jvm") version "1.3.72"
+  id("org.jetbrains.intellij") version "0.6.5"
+  id("org.jetbrains.changelog") version "0.6.2"
 }
 
-group = "org.acejump"
-version = "chylex-21"
-
-repositories {
-  mavenCentral()
-}
-
-intellij {
-  version.set("2024.2")
-  updateSinceUntilBuild.set(false)
+tasks {
+  withType<KotlinCompile> {
+    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
+    kotlinOptions.freeCompilerArgs += "-progressive"
+  }
   
-  plugins.add("IdeaVIM:chylex-40")
-  plugins.add("com.intellij.classic.ui:242.20224.159")
-  
-  pluginsRepositories {
-    custom("https://intellij.chylex.com")
-    marketplace()
+  withType<PatchPluginXmlTask> {
+    sinceBuild("201.6668.0")
+    changeNotes({ changelog.getLatest().toHTML() })
   }
 }
 
-kotlin {
-  jvmToolchain(17)
+changelog {
+  path = "${project.projectDir}/CHANGES.md"
+  header = closure { "${project.version}" }
 }
 
 dependencies {
-  testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
+  compileOnly(kotlin("stdlib-jdk8"))
 }
 
-tasks.patchPluginXml {
-  sinceBuild.set("242")
+repositories {
+  mavenCentral()
+  jcenter()
 }
 
-tasks.buildSearchableOptions {
-  enabled = false
+intellij {
+  version = "2020.2"
+  pluginName = "AceJump"
+  updateSinceUntilBuild = false
+  setPlugins("java")
 }
 
-tasks.test {
-  useJUnitPlatform()
-}
-
-tasks.withType<KotlinCompile> {
-  kotlinOptions.freeCompilerArgs = listOf(
-    "-Xjvm-default=all"
-  )
-}
+group = "org.acejump"
+version = "4.0"

gradle.properties

@@ -1 +0,0 @@
-kotlin.stdlib.default.dependency=false

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,111 +17,78 @@
 #
 
 ##############################################################################
-#
-#   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/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-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
+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
 done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
-# 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
+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"'
 
 # 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
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
-
 # Determine the Java command to use to start the JVM.
 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
@@ -130,120 +97,87 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    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.
+    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.
 
 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" && ! "$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=SC2039,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=SC2039,SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
+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
 
-# 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.
+# 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" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
-    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
+    # 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" ;;
+    esac
 fi
 
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
 
-# 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, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
-
-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' ' '
-    )" '"$@"'
+# 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"
 
 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,8 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -55,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -65,26 +64,38 @@ echo location of your Java installation.
 
 goto fail
 
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
-
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="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!
-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%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/main/java/org/acejump/action/AceVimUtil.java

@@ -1,13 +0,0 @@
-package org.acejump.action;
-
-import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.api.VimEditor;
-import com.maddyhome.idea.vim.state.mode.SelectionType;
-
-final class AceVimUtil {
-  private AceVimUtil() {}
-
-  public static void enterVisualMode(final VimEditor vim, final SelectionType mode) {
-    VimPlugin.getVisualMotion().enterVisualMode(vim, mode);
-  }
-}

src/main/kotlin/org/acejump/AceUtil.kt

@@ -1,11 +1,9 @@
 package org.acejump
 
 import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.fileEditor.TextEditor
-import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx
-import com.intellij.openapi.project.Project
-import com.intellij.util.IncorrectOperationException
-import it.unimi.dsi.fastutil.ints.IntArrayList
+import com.intellij.openapi.editor.actions.EditorActionUtil
+
+annotation class ExternalUsage
 
 /**
  * Returns an immutable version of the currently edited document.
@@ -13,21 +11,6 @@ import it.unimi.dsi.fastutil.ints.IntArrayList
 val Editor.immutableText
   get() = this.document.immutableCharSequence
 
-/**
- * Returns all open editors in the project.
- */
-val Project.openEditors: List<Editor>
-  get() {
-    return try {
-      FileEditorManagerEx.getInstanceEx(this)
-        .splitters
-        .getSelectedEditors()
-        .mapNotNull { (it as? TextEditor)?.editor }
-    } catch (e: IncorrectOperationException) {
-      emptyList()
-    }
-  }
-
 /**
  * Returns true if [this] contains [otherText] at the specified offset.
  */
@@ -50,12 +33,77 @@ fun CharSequence.countMatchingCharacters(selfOffset: Int, otherText: String): In
   return i
 }
 
-fun MutableMap<Editor, IntArrayList>.clone(): MutableMap<Editor, IntArrayList> {
-  val clone = HashMap<Editor, IntArrayList>(size)
+/**
+ * Determines which characters form a "word" for the purposes of functions below.
+ */
+val Char.isWordPart
+  get() = this.isJavaIdentifierPart()
+
+/**
+ * Finds index of the first character in a word.
+ */
+inline fun CharSequence.wordStart(pos: Int, isPartOfWord: (Char) -> Boolean = Char::isWordPart): Int {
+  var start = pos
   
-  for ((editor, offsets) in this) {
-    clone[editor] = offsets.clone()
+  while (start > 0 && isPartOfWord(this[start - 1])) {
+    --start
   }
   
-  return clone
+  return start
+}
+
+/**
+ * Finds index of the last character in a word.
+ */
+inline fun CharSequence.wordEnd(pos: Int, isPartOfWord: (Char) -> Boolean = Char::isWordPart): Int {
+  var end = pos
+  
+  while (end < length - 1 && isPartOfWord(this[end + 1])) {
+    ++end
+  }
+  
+  return end
+}
+
+/**
+ * Finds index of the previous "camelHumps" hump in a word.
+ */
+inline fun CharSequence.humpStart(pos: Int, isPartOfWord: (Char) -> Boolean = Char::isWordPart): Int {
+  var start = pos
+  
+  while (start > 0 && isPartOfWord(this[start - 1]) && !EditorActionUtil.isHumpBound(this, start, true)) {
+    --start
+  }
+  
+  return start
+}
+
+/**
+ * Finds index of the next "camelHumps" hump in a word.
+ */
+inline fun CharSequence.humpEnd(pos: Int, isPartOfWord: (Char) -> Boolean = Char::isWordPart): Int {
+  var end = pos
+  
+  while (end < length - 1 && isPartOfWord(this[end + 1]) && !EditorActionUtil.isHumpBound(this, end + 1, false)) {
+    ++end
+  }
+  
+  return end
+}
+
+/**
+ * Finds index of the first word character following a sequence of non-word characters following the end of a word.
+ */
+inline fun CharSequence.wordEndPlus(pos: Int, isPartOfWord: (Char) -> Boolean = Char::isWordPart): Int {
+  var end = this.wordEnd(pos, isPartOfWord)
+  
+  while (end < length - 1 && !isPartOfWord(this[end + 1])) {
+    ++end
+  }
+  
+  if (end < length - 1 && isPartOfWord(this[end + 1])) {
+    ++end
+  }
+  
+  return end
 }

src/main/kotlin/org/acejump/action/AceEditorAction.kt

@@ -4,13 +4,15 @@ import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.editor.Caret
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.actionSystem.EditorActionHandler
+import org.acejump.boundaries.StandardBoundaries
+import org.acejump.search.Pattern
 import org.acejump.session.Session
 import org.acejump.session.SessionManager
 
 /**
  * Base class for keyboard-activated overrides of existing editor actions, that have a different meaning during an AceJump [Session].
  */
-abstract class AceEditorAction(private val originalHandler: EditorActionHandler) : EditorActionHandler() {
+sealed class AceEditorAction(private val originalHandler: EditorActionHandler) : EditorActionHandler() {
   final override fun isEnabledForCaret(editor: Editor, caret: Caret, dataContext: DataContext?): Boolean {
     return SessionManager[editor] != null || originalHandler.isEnabled(editor, caret, dataContext)
   }
@@ -38,7 +40,15 @@ abstract class AceEditorAction(private val originalHandler: EditorActionHandler)
     override fun run(session: Session) = session.restart()
   }
   
-  class TagImmediately(originalHandler: EditorActionHandler) : AceEditorAction(originalHandler) {
-    override fun run(session: Session) = session.tagImmediately()
+  class SearchLineStarts(originalHandler: EditorActionHandler) : AceEditorAction(originalHandler) {
+    override fun run(session: Session) = session.startRegexSearch(Pattern.LINE_STARTS, StandardBoundaries.VISIBLE_ON_SCREEN)
+  }
+  
+  class SearchLineEnds(originalHandler: EditorActionHandler) : AceEditorAction(originalHandler) {
+    override fun run(session: Session) = session.startRegexSearch(Pattern.LINE_ENDS, StandardBoundaries.VISIBLE_ON_SCREEN)
+  }
+  
+  class SearchLineIndents(originalHandler: EditorActionHandler) : AceEditorAction(originalHandler) {
+    override fun run(session: Session) = session.startRegexSearch(Pattern.LINE_INDENTS, StandardBoundaries.VISIBLE_ON_SCREEN)
   }
 }

src/main/kotlin/org/acejump/action/AceKeyboardAction.kt

@@ -0,0 +1,51 @@
+package org.acejump.action
+
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.CommonDataKeys.EDITOR
+import com.intellij.openapi.project.DumbAwareAction
+import org.acejump.boundaries.Boundaries
+import org.acejump.boundaries.StandardBoundaries.*
+import org.acejump.search.Pattern
+import org.acejump.session.Session
+import org.acejump.session.SessionManager
+
+/**
+ * Base class for keyboard-activated actions that create or update an AceJump [Session].
+ */
+sealed class AceKeyboardAction : DumbAwareAction() {
+  final override fun update(action: AnActionEvent) {
+    action.presentation.isEnabled = action.getData(EDITOR) != null
+  }
+  
+  final override fun actionPerformed(e: AnActionEvent) {
+    invoke(SessionManager.start(e.getData(EDITOR) ?: return))
+  }
+  
+  abstract operator fun invoke(session: Session)
+  
+  /**
+   * Generic action type that starts a regex search.
+   */
+  abstract class BaseRegexSearchAction(private val pattern: Pattern, private val boundaries: Boundaries) : AceKeyboardAction() {
+    override fun invoke(session: Session) = session.startRegexSearch(pattern, boundaries)
+  }
+  
+  /**
+   * Starts or ends an AceJump session.
+   */
+  object ActivateAceJump : AceKeyboardAction() {
+    override fun invoke(session: Session) = session.cycleMode()
+  }
+  
+  // @formatter:off
+  
+  object StartAllWordsMode          : BaseRegexSearchAction(Pattern.ALL_WORDS, VISIBLE_ON_SCREEN)
+  object StartAllWordsBackwardsMode : BaseRegexSearchAction(Pattern.ALL_WORDS, BEFORE_CARET.intersection(VISIBLE_ON_SCREEN))
+  object StartAllWordsForwardMode   : BaseRegexSearchAction(Pattern.ALL_WORDS, AFTER_CARET.intersection(VISIBLE_ON_SCREEN))
+  object StartAllLineStartsMode     : BaseRegexSearchAction(Pattern.LINE_STARTS, VISIBLE_ON_SCREEN)
+  object StartAllLineEndsMode       : BaseRegexSearchAction(Pattern.LINE_ENDS, VISIBLE_ON_SCREEN)
+  object StartAllLineIndentsMode    : BaseRegexSearchAction(Pattern.LINE_INDENTS, VISIBLE_ON_SCREEN)
+  object StartAllLineMarksMode      : BaseRegexSearchAction(Pattern.LINE_ALL_MARKS, VISIBLE_ON_SCREEN)
+  
+  // @formatter:on
+}

src/main/kotlin/org/acejump/action/AceTagAction.kt

@@ -1,69 +1,127 @@
 package org.acejump.action
 
+import com.intellij.codeInsight.intention.actions.ShowIntentionActionsAction
+import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction
+import com.intellij.codeInsight.navigation.actions.GotoTypeDeclarationAction
+import com.intellij.find.actions.FindUsagesAction
+import com.intellij.find.actions.ShowUsagesAction
+import com.intellij.ide.actions.CopyAction
+import com.intellij.ide.actions.CutAction
+import com.intellij.ide.actions.PasteAction
 import com.intellij.openapi.actionSystem.ActionManager
+import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.IdeActions
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.command.UndoConfirmationPolicy
+import com.intellij.openapi.command.WriteCommandAction
+import com.intellij.openapi.editor.CaretState
 import com.intellij.openapi.editor.Document
 import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.editor.LogicalPosition
 import com.intellij.openapi.editor.actionSystem.DocCommandGroupId
-import com.intellij.openapi.fileEditor.TextEditor
-import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx
 import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.playback.commands.ActionCommand
-import org.acejump.search.Tag
+import com.intellij.openapi.util.TextRange
+import com.intellij.refactoring.actions.RefactoringQuickListPopupAction
+import org.acejump.*
+import org.acejump.search.SearchProcessor
+import kotlin.math.max
 
 /**
  * Base class for actions available after typing a tag.
  */
 sealed class AceTagAction {
-  abstract operator fun invoke(tag: Tag, shiftMode: Boolean, isFinal: Boolean)
+  abstract operator fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean)
   
   abstract class BaseJumpAction : AceTagAction() {
-    override fun invoke(tag: Tag, shiftMode: Boolean, isFinal: Boolean) {
-      val editor = tag.editor
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
       val caretModel = editor.caretModel
       val oldCarets = if (shiftMode) caretModel.caretsAndSelections else emptyList()
       
-      editor.project?.let { addCurrentPositionToHistory(it, editor.document) }
-      
-      if (isFinal) {
-        ensureEditorFocused(editor)
-      }
-      
-      moveCaretTo(editor, tag.offset)
+      recordCaretPosition(editor)
+      moveCaretTo(editor, getCaretOffset(editor, searchProcessor, offset))
       
       if (shiftMode) {
         caretModel.caretsAndSelections = oldCarets + caretModel.caretsAndSelections
       }
     }
+    
+    abstract fun getCaretOffset(editor: Editor, searchProcessor: SearchProcessor, offset: Int): Int
+  }
+  
+  abstract class BaseSelectAction : AceTagAction() {
+    final override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
+      if (shiftMode) {
+        val caretModel = editor.caretModel
+        val oldCarets = caretModel.caretsAndSelections
+        val oldOffsetPosition = caretModel.logicalPosition
+        
+        invoke(editor, searchProcessor, offset)
+        
+        if (caretModel.caretsAndSelections.any { isSelectionOverlapping(oldOffsetPosition, it) }) {
+          oldCarets.removeAll { isSelectionOverlapping(oldOffsetPosition, it) }
+        }
+        
+        caretModel.caretsAndSelections = oldCarets + caretModel.caretsAndSelections
+      }
+      else {
+        invoke(editor, searchProcessor, offset)
+      }
+    }
+    
+    private fun isSelectionOverlapping(offset: LogicalPosition, oldCaret: CaretState): Boolean {
+      return oldCaret.caretPosition == offset || oldCaret.selectionStart == offset || oldCaret.selectionEnd == offset
+    }
+    
+    protected abstract operator fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int)
+  }
+  
+  abstract class BaseWordAction : BaseJumpAction() {
+    final override fun getCaretOffset(editor: Editor, searchProcessor: SearchProcessor, offset: Int): Int {
+      val matchingChars = countMatchingCharacters(editor, searchProcessor, offset)
+      val targetOffset = offset + matchingChars
+      val isInsideWord = matchingChars > 0 && editor.immutableText.let { it[targetOffset - 1].isWordPart && it[targetOffset].isWordPart }
+      
+      return getCaretOffset(editor, offset, targetOffset, isInsideWord)
+    }
+    
+    abstract fun getCaretOffset(editor: Editor, queryStartOffset: Int, queryEndOffset: Int, isInsideWord: Boolean): Int
+  }
+  
+  abstract class BaseCaretRestoringAction : AceTagAction() {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
+      val oldCarets = editor.caretModel.caretsAndSelections
+      doInvoke(editor, searchProcessor, offset, shiftMode)
+      editor.caretModel.caretsAndSelections = oldCarets
+    }
+    
+    protected abstract fun doInvoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean)
   }
   
   private companion object {
+    fun countMatchingCharacters(editor: Editor, searchProcessor: SearchProcessor, offset: Int): Int {
+      return editor.immutableText.countMatchingCharacters(offset, searchProcessor.query.rawText)
+    }
+    
+    fun recordCaretPosition(editor: Editor) = with(editor) {
+      project?.let { addCurrentPositionToHistory(it, document) }
+    }
+    
     fun moveCaretTo(editor: Editor, offset: Int) = with(editor) {
       selectionModel.removeSelection(true)
       caretModel.removeSecondaryCarets()
       caretModel.moveToOffset(offset)
     }
     
-    fun performAction(actionName: String) {
-      val actionManager = ActionManager.getInstance()
-      val action = actionManager.getAction(actionName)
-      if (action != null) {
-        actionManager.tryToExecute(action, ActionCommand.getInputEvent(null), null, null, true)
-      }
+    fun selectRange(editor: Editor, fromOffset: Int, toOffset: Int, cursorOffset: Int = toOffset) = with(editor) {
+      selectionModel.removeSelection(true)
+      selectionModel.setSelection(fromOffset, toOffset)
+      caretModel.moveToOffset(cursorOffset)
     }
     
-    fun ensureEditorFocused(editor: Editor) {
-      val project = editor.project ?: return
-      val fem = FileEditorManagerEx.getInstanceEx(project)
-      
-      val window = fem.windows.firstOrNull { (it.selectedComposite?.selectedWithProvider?.fileEditor as? TextEditor)?.editor === editor }
-      if (window != null && window !== fem.currentWindow) {
-        fem.currentWindow = window
-      }
+    fun performAction(action: AnAction) {
+      ActionManager.getInstance().tryToExecute(action, ActionCommand.getInputEvent(null), null, null, true)
     }
     
     private fun addCurrentPositionToHistory(project: Project, document: Document) {
@@ -83,17 +141,282 @@ sealed class AceTagAction {
    * On default action, places the caret at the first character of the search query.
    * On shift action, adds the new caret to existing carets.
    */
-  object JumpToSearchStart : BaseJumpAction()
+  object JumpToSearchStart : BaseJumpAction() {
+    override fun getCaretOffset(editor: Editor, searchProcessor: SearchProcessor, offset: Int): Int {
+      return offset
+    }
+  }
+  
+  /**
+   * On default action, places the caret at the last character of the search query.
+   * On shift action, adds the new caret to existing carets.
+   */
+  object JumpToSearchEnd : BaseJumpAction() {
+    override fun getCaretOffset(editor: Editor, searchProcessor: SearchProcessor, offset: Int): Int {
+      return offset + max(0, countMatchingCharacters(editor, searchProcessor, offset) - 1)
+    }
+  }
+  
+  /**
+   * On default action, places the caret just past the last character of the search query.
+   * On shift action, adds the new caret to existing carets.
+   */
+  object JumpPastSearchEnd : BaseJumpAction() {
+    override fun getCaretOffset(editor: Editor, searchProcessor: SearchProcessor, offset: Int): Int {
+      return offset + countMatchingCharacters(editor, searchProcessor, offset)
+    }
+  }
+  
+  /**
+   * On default action, places the caret at the start of a word. Word detection uses [Character.isJavaIdentifierPart] to count some special
+   * characters, such as underscores, as part of a word. If there is no word at the last character of the search query, then the caret is
+   * placed at the first character of the search query.
+   *
+   * On shift action, adds the new caret to existing carets.
+   */
+  object JumpToWordStartTag : BaseWordAction() {
+    override fun getCaretOffset(editor: Editor, queryStartOffset: Int, queryEndOffset: Int, isInsideWord: Boolean): Int {
+      return if (isInsideWord)
+        editor.immutableText.wordStart(queryEndOffset)
+      else
+        queryStartOffset
+    }
+  }
+  
+  /**
+   * On default action, places the caret at the end of a word. Word detection uses [Character.isJavaIdentifierPart] to count some special
+   * characters, such as underscores, as part of a word. If there is no word at the last character of the search query, then the caret is
+   * placed after the last character of the search query.
+   *
+   * On shift action, adds the new caret to existing carets.
+   */
+  object JumpToWordEndTag : BaseWordAction() {
+    override fun getCaretOffset(editor: Editor, queryStartOffset: Int, queryEndOffset: Int, isInsideWord: Boolean): Int {
+      return if (isInsideWord)
+        editor.immutableText.wordEnd(queryEndOffset) + 1
+      else
+        queryEndOffset
+    }
+  }
+  
+  object SelectQuery : BaseSelectAction() {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int) {
+      recordCaretPosition(editor)
+      
+      val startOffset = JumpToSearchStart.getCaretOffset(editor, searchProcessor, offset)
+      val endOffset = JumpPastSearchEnd.getCaretOffset(editor, searchProcessor, offset)
+      
+      selectRange(editor, startOffset, endOffset)
+    }
+  }
+  
+  /**
+   * On default action, places the caret at the end of a word, and also selects the entire word. Word detection uses
+   * [Character.isJavaIdentifierPart] to count some special characters, such as underscores, as part of a word. If there is no word at the
+   * first character of the search query, then the caret is placed after the last character of the search query, and all text between the
+   * start and end of the search query is selected.
+   *
+   * On shift action, adds the new selection to existing selections.
+   */
+  object SelectWord : BaseSelectAction() {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int) {
+      val chars = editor.immutableText
+      val queryEndOffset = JumpToSearchEnd.getCaretOffset(editor, searchProcessor, offset)
+      
+      if (chars[queryEndOffset].isWordPart) {
+        recordCaretPosition(editor)
+        
+        val startOffset = JumpToWordStartTag.getCaretOffset(editor, offset, queryEndOffset, isInsideWord = true)
+        val endOffset = JumpToWordEndTag.getCaretOffset(editor, offset, queryEndOffset, isInsideWord = true)
+        
+        selectRange(editor, startOffset, endOffset)
+      }
+      else {
+        SelectQuery(editor, searchProcessor, offset, shiftMode = false)
+      }
+    }
+  }
+  
+  object SelectHump : BaseSelectAction() {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int) {
+      val chars = editor.immutableText
+      val queryEndOffset = JumpToSearchEnd.getCaretOffset(editor, searchProcessor, offset)
+      
+      if (chars[queryEndOffset].isWordPart) {
+        recordCaretPosition(editor)
+        
+        val startOffset = chars.humpStart(queryEndOffset)
+        val endOffset = chars.humpEnd(queryEndOffset) + 1
+        
+        selectRange(editor, startOffset, endOffset)
+      }
+      else {
+        SelectQuery(editor, searchProcessor, offset, shiftMode = false)
+      }
+    }
+  }
+  
+  object SelectLine : BaseSelectAction() {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int) {
+      JumpToSearchEnd(editor, searchProcessor, offset, shiftMode = false)
+      editor.selectionModel.selectLineAtCaret()
+    }
+  }
+  
+  class SelectExtended(private val extendCount: Int) : BaseSelectAction() {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int) {
+      JumpToSearchEnd(editor, searchProcessor, offset, shiftMode = false)
+      
+      val action = ActionManager.getInstance().getAction(IdeActions.ACTION_EDITOR_SELECT_WORD_AT_CARET)
+      
+      repeat(extendCount) {
+        performAction(action)
+      }
+    }
+  }
+  
+  class SelectToCaret(private val jumper: BaseJumpAction) : BaseSelectAction() {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int) {
+      val caretModel = editor.caretModel
+      val oldOffset = caretModel.offset
+      val oldSelection = editor.selectionModel.takeIf { it.hasSelection(false) }?.let { it.selectionStart..it.selectionEnd }
+      
+      jumper(editor, searchProcessor, offset, shiftMode = false)
+      
+      val newOffset = caretModel.offset
+      
+      if (oldSelection == null) {
+        selectRange(editor, oldOffset, newOffset)
+      }
+      else {
+        selectRange(editor, minOf(oldOffset, newOffset, oldSelection.first), maxOf(oldOffset, newOffset, oldSelection.last), newOffset)
+      }
+    }
+  }
+  
+  class SelectBetweenPoints(private val firstOffset: Int, private val secondOffsetJumper: BaseJumpAction) : BaseSelectAction() {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int) {
+      secondOffsetJumper(editor, searchProcessor, offset, shiftMode = false)
+      selectRange(editor, firstOffset, editor.caretModel.offset)
+    }
+  }
+  
+  class Cut(private val selector: AceTagAction) : BaseCaretRestoringAction() {
+    override fun doInvoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
+      selector(editor, searchProcessor, offset, shiftMode = false)
+      performAction(CutAction())
+    }
+  }
+  
+  class Copy(private val selector: AceTagAction) : BaseCaretRestoringAction() {
+    override fun doInvoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
+      selector(editor, searchProcessor, offset, shiftMode = false)
+      performAction(CopyAction())
+    }
+  }
+  
+  class Paste(private val selector: AceTagAction) : BaseCaretRestoringAction() {
+    override fun doInvoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
+      selector(editor, searchProcessor, offset, shiftMode = false)
+      performAction(PasteAction())
+    }
+  }
+  
+  class Delete(private val selector: AceTagAction) : BaseCaretRestoringAction() {
+    override fun doInvoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
+      selector(editor, searchProcessor, offset, shiftMode = false)
+      WriteCommandAction.writeCommandAction(editor.project).withName("AceJump Delete").run<Throwable> {
+        editor.selectionModel.let { editor.document.deleteString(it.selectionStart, it.selectionEnd) }
+      }
+    }
+  }
+  
+  class CloneToCaret(private val selector: AceTagAction) : AceTagAction() {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
+      val document = editor.document
+      val oldCarets = editor.caretModel.caretsAndSelections
+  
+      selector(editor, searchProcessor, offset, shiftMode = false)
+      val text = document.getText(editor.selectionModel.let { TextRange(it.selectionStart, it.selectionEnd) })
+  
+      editor.caretModel.caretsAndSelections = oldCarets
+      WriteCommandAction.writeCommandAction(editor.project).withName("AceJump Clone").run<Throwable> {
+        insertAtCarets(editor, text)
+      }
+    }
+    
+    companion object {
+      fun insertAtCarets(editor: Editor, text: String) {
+        val document = editor.document
+        
+        editor.caretModel.runForEachCaret {
+          if (it.hasSelection()) {
+            document.replaceString(it.selectionStart, it.selectionEnd, text)
+          }
+          else {
+            document.insertString(it.offset, text)
+          }
+        }
+      }
+    }
+  }
+  
+  class MoveToCaret(private val selector: AceTagAction) : AceTagAction() {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
+      val document = editor.document
+      val oldCarets = editor.caretModel.caretsAndSelections
+  
+      selector(editor, searchProcessor, offset, shiftMode = false)
+      val start = editor.selectionModel.selectionStart
+      val end = editor.selectionModel.selectionEnd
+      val text = document.getText(TextRange(start, end))
+  
+      editor.caretModel.caretsAndSelections = oldCarets
+      WriteCommandAction.writeCommandAction(editor.project).withName("AceJump Move").run<Throwable> {
+        document.deleteString(start, end)
+        CloneToCaret.insertAtCarets(editor, text)
+      }
+    }
+  }
   
   /**
    * On default action, performs the Go To Declaration action, available via `Navigate | Declaration or Usages`.
    * On shift action, performs the Go To Type Declaration action, available via `Navigate | Type Declaration`.
-   * Always places the caret at the start of the word.
+   * Always places the caret at the end of the search query.
    */
-  object GoToDeclaration : AceTagAction() {
-    override fun invoke(tag: Tag, shiftMode: Boolean, isFinal: Boolean) {
-      JumpToSearchStart.invoke(tag, shiftMode = false, isFinal = isFinal)
-      ApplicationManager.getApplication().invokeLater { performAction(if (shiftMode) IdeActions.ACTION_GOTO_TYPE_DECLARATION else IdeActions.ACTION_GOTO_DECLARATION) }
+  object GoToDeclaration : BaseCaretRestoringAction() {
+    override fun doInvoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
+      JumpToSearchEnd(editor, searchProcessor, offset, shiftMode = false)
+      performAction(if (shiftMode) GotoTypeDeclarationAction() else GotoDeclarationAction())
+    }
+  }
+  
+  /**
+   * On default action, performs the Show Usages action, available via the context menu.
+   * On shift action, performs the Find Usages action, available via the context menu.
+   * Always places the caret at the end of the search query.
+   */
+  object ShowUsages : BaseCaretRestoringAction() {
+    override fun doInvoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
+      JumpToSearchEnd(editor, searchProcessor, offset, shiftMode = false)
+      performAction(if (shiftMode) FindUsagesAction() else ShowUsagesAction())
+    }
+  }
+  
+  /**
+   * Performs the Show Context Actions action, available via the context menu or Alt+Enter.
+   */
+  object ShowIntentions : AceTagAction() {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
+      JumpToWordStartTag(editor, searchProcessor, offset, shiftMode = false)
+      performAction(ShowIntentionActionsAction())
+    }
+  }
+  
+  object Refactor : AceTagAction() {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
+      JumpToWordStartTag(editor, searchProcessor, offset, shiftMode = false)
+      performAction(RefactoringQuickListPopupAction())
     }
   }
 }

src/main/kotlin/org/acejump/action/AceVimAction.kt

@@ -1,189 +0,0 @@
-package org.acejump.action
-
-import com.intellij.openapi.actionSystem.ActionUpdateThread
-import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.actionSystem.CommonDataKeys
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.application.WriteAction
-import com.intellij.openapi.project.DumbAwareAction
-import com.maddyhome.idea.vim.KeyHandler
-import com.maddyhome.idea.vim.action.change.change.ChangeVisualAction
-import com.maddyhome.idea.vim.action.change.delete.DeleteVisualAction
-import com.maddyhome.idea.vim.action.copy.YankVisualAction
-import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.group.visual.vimSetSelection
-import com.maddyhome.idea.vim.helper.inVisualMode
-import com.maddyhome.idea.vim.helper.vimSelectionStart
-import com.maddyhome.idea.vim.newapi.vim
-import com.maddyhome.idea.vim.state.mode.Mode
-import com.maddyhome.idea.vim.state.mode.SelectionType
-import org.acejump.boundaries.StandardBoundaries.AFTER_CARET
-import org.acejump.boundaries.StandardBoundaries.BEFORE_CARET
-import org.acejump.boundaries.StandardBoundaries.CARET_LINE
-import org.acejump.boundaries.StandardBoundaries.VISIBLE_ON_SCREEN
-import org.acejump.modes.JumpMode
-import org.acejump.search.Pattern
-import org.acejump.search.Tag
-import org.acejump.session.SessionManager
-import org.acejump.session.SessionState
-
-sealed class AceVimAction : DumbAwareAction() {
-  protected abstract val mode: AceVimMode
-  
-  final override fun actionPerformed(e: AnActionEvent) {
-    val editor = e.getData(CommonDataKeys.EDITOR) ?: return
-    val context = e.dataContext.vim
-    
-    val caret = editor.caretModel.currentCaret
-    val initialOffset = caret.offset
-    val selectionStart = if (editor.inVisualMode) caret.vimSelectionStart else null
-    
-    val session = SessionManager.start(editor, mode.getJumpEditors(editor))
-    
-    session.defaultBoundary = mode.boundaries
-    session.startJumpMode {
-      object : JumpMode() {
-        override fun accept(state: SessionState, acceptedTag: Tag) {
-          AceTagAction.JumpToSearchStart.invoke(acceptedTag, shiftMode = wasUpperCase, isFinal = true)
-          
-          if (selectionStart != null) {
-            caret.vim.vimSetSelection(selectionStart, caret.offset, moveCaretToSelectionEnd = true)
-          }
-          else {
-            val vim = editor.vim
-            val keyHandler = KeyHandler.getInstance()
-            if (keyHandler.isOperatorPending(vim.mode, keyHandler.keyHandlerState)) {
-              val key = keyHandler.keyHandlerState.commandBuilder.keys.singleOrNull()?.keyChar
-              
-              keyHandler.fullReset(vim)
-              
-              AceVimUtil.enterVisualMode(vim, SelectionType.CHARACTER_WISE)
-              caret.vim.vimSetSelection(caret.offset, initialOffset, moveCaretToSelectionEnd = true)
-              
-              val action = when (key) {
-                'd'  -> DeleteVisualAction()
-                'c'  -> ChangeVisualAction()
-                'y'  -> YankVisualAction()
-                else -> null
-              }
-              
-              if (action != null) {
-                ApplicationManager.getApplication().invokeLater {
-                  WriteAction.run<Nothing> {
-                    keyHandler.keyHandlerState.commandBuilder.pushCommandPart(action)
-                    
-                    val cmd = keyHandler.keyHandlerState.commandBuilder.buildCommand()
-                    val operatorArguments = OperatorArguments(vim.mode is Mode.OP_PENDING, cmd.rawCount, injector.vimState.mode)
-                    
-                    injector.vimState.executingCommand = cmd
-                    injector.actionExecutor.executeVimAction(vim, action, context, operatorArguments)
-                  }
-                  
-                  keyHandler.reset(vim)
-                }
-              }
-            }
-          }
-          
-          injector.scroll.scrollCaretIntoView(editor.vim)
-          mode.finishSession(editor, session)
-        }
-      }
-    }
-    
-    mode.setupSession(editor, session)
-  }
-  
-  class JumpAllEditors : AceVimAction() {
-    override val mode = AceVimMode.JumpAllEditors
-  }
-  
-  class JumpForward : AceVimAction() {
-    override val mode = AceVimMode.Jump(AFTER_CARET.intersection(VISIBLE_ON_SCREEN))
-  }
-  
-  class JumpBackward : AceVimAction() {
-    override val mode = AceVimMode.Jump(BEFORE_CARET.intersection(VISIBLE_ON_SCREEN))
-  }
-  
-  class JumpTillForward : AceVimAction() {
-    override val mode = AceVimMode.JumpTillForward(AFTER_CARET.intersection(VISIBLE_ON_SCREEN))
-  }
-  
-  class JumpTillBackward : AceVimAction() {
-    override val mode = AceVimMode.JumpTillBackward(BEFORE_CARET.intersection(VISIBLE_ON_SCREEN))
-  }
-  
-  class JumpOnLineForward : AceVimAction() {
-    override val mode = AceVimMode.Jump(AFTER_CARET.intersection(CARET_LINE))
-  }
-  
-  class JumpOnLineBackward : AceVimAction() {
-    override val mode = AceVimMode.Jump(BEFORE_CARET.intersection(CARET_LINE))
-  }
-  
-  class JumpLineIndentsForward : AceVimAction() {
-    override val mode = AceVimMode.JumpToPattern(Pattern.LINE_INDENTS, AFTER_CARET.intersection(VISIBLE_ON_SCREEN))
-  }
-  
-  class JumpLineIndentsBackward : AceVimAction() {
-    override val mode = AceVimMode.JumpToPattern(Pattern.LINE_INDENTS, BEFORE_CARET.intersection(VISIBLE_ON_SCREEN))
-  }
-  
-  class JumpLWordForward : AceVimAction() {
-    override val mode = AceVimMode.JumpToPattern(Pattern.VIM_LWORD, AFTER_CARET.intersection(VISIBLE_ON_SCREEN))
-  }
-  
-  class JumpUWordForward : AceVimAction() {
-    override val mode = AceVimMode.JumpToPattern(Pattern.VIM_UWORD, AFTER_CARET.intersection(VISIBLE_ON_SCREEN))
-  }
-  
-  class JumpLWordBackward : AceVimAction() {
-    override val mode = AceVimMode.JumpToPattern(Pattern.VIM_LWORD, BEFORE_CARET.intersection(VISIBLE_ON_SCREEN))
-  }
-  
-  class JumpUWordBackward : AceVimAction() {
-    override val mode = AceVimMode.JumpToPattern(Pattern.VIM_UWORD, BEFORE_CARET.intersection(VISIBLE_ON_SCREEN))
-  }
-  
-  class JumpLWordEndForward : AceVimAction() {
-    override val mode = AceVimMode.JumpToPattern(Pattern.VIM_LWORD_END, AFTER_CARET.intersection(VISIBLE_ON_SCREEN))
-  }
-  
-  class JumpUWordEndForward : AceVimAction() {
-    override val mode = AceVimMode.JumpToPattern(Pattern.VIM_UWORD_END, AFTER_CARET.intersection(VISIBLE_ON_SCREEN))
-  }
-  
-  class JumpLWordEndBackward : AceVimAction() {
-    override val mode = AceVimMode.JumpToPattern(Pattern.VIM_LWORD_END, BEFORE_CARET.intersection(VISIBLE_ON_SCREEN))
-  }
-  
-  class JumpUWordEndBackward : AceVimAction() {
-    override val mode = AceVimMode.JumpToPattern(Pattern.VIM_UWORD_END, BEFORE_CARET.intersection(VISIBLE_ON_SCREEN))
-  }
-  
-  class JumpAllEditorsGoToDeclaration : DumbAwareAction() {
-    override fun update(action: AnActionEvent) {
-      action.presentation.isEnabled = action.getData(CommonDataKeys.EDITOR) != null
-    }
-    
-    override fun getActionUpdateThread(): ActionUpdateThread {
-      return ActionUpdateThread.BGT
-    }
-    
-    override fun actionPerformed(e: AnActionEvent) {
-      val editor = e.getData(CommonDataKeys.EDITOR) ?: return
-      val session = SessionManager.start(editor, AceVimMode.JumpAllEditors.getJumpEditors(editor))
-      
-      session.defaultBoundary = VISIBLE_ON_SCREEN
-      session.startJumpMode {
-        object : JumpMode() {
-          override fun accept(state: SessionState, acceptedTag: Tag) {
-            AceTagAction.GoToDeclaration.invoke(acceptedTag, shiftMode = wasUpperCase, isFinal = true)
-          }
-        }
-      }
-    }
-  }
-}

src/main/kotlin/org/acejump/action/AceVimMode.kt

@@ -1,64 +0,0 @@
-package org.acejump.action
-
-import com.intellij.openapi.editor.Editor
-import org.acejump.boundaries.Boundaries
-import org.acejump.boundaries.StandardBoundaries
-import org.acejump.openEditors
-import org.acejump.search.Pattern
-import org.acejump.session.Session
-
-sealed class AceVimMode {
-  abstract val boundaries: Boundaries
-  
-  open fun getJumpEditors(mainEditor: Editor): List<Editor> {
-    return listOf(mainEditor)
-  }
-  
-  open fun setupSession(editor: Editor, session: Session) {}
-  open fun finishSession(editor: Editor, session: Session) {}
-  
-  class Jump(override val boundaries: Boundaries) : AceVimMode()
-  
-  object JumpAllEditors : AceVimMode() {
-    override val boundaries = StandardBoundaries.VISIBLE_ON_SCREEN
-    override fun getJumpEditors(mainEditor: Editor): List<Editor> {
-      val project = mainEditor.project ?: return super.getJumpEditors(mainEditor)
-      
-      return project.openEditors
-        .sortedBy { if (it === mainEditor) 0 else 1 }
-        .ifEmpty { listOf(mainEditor) }
-    }
-  }
-  
-  class JumpTillForward(override val boundaries: Boundaries) : AceVimMode() {
-    override fun finishSession(editor: Editor, session: Session) {
-      val document = editor.document
-      
-      for (caret in editor.caretModel.allCarets) {
-        val offset = caret.offset
-        if (offset > document.getLineStartOffset(document.getLineNumber(offset))) {
-          caret.moveToOffset(offset - 1, false)
-        }
-      }
-    }
-  }
-  
-  class JumpTillBackward(override val boundaries: Boundaries) : AceVimMode() {
-    override fun finishSession(editor: Editor, session: Session) {
-      val document = editor.document
-      
-      for (caret in editor.caretModel.allCarets) {
-        val offset = caret.offset
-        if (offset < document.getLineEndOffset(document.getLineNumber(offset))) {
-          caret.moveToOffset(offset + 1, false)
-        }
-      }
-    }
-  }
-  
-  class JumpToPattern(private val pattern: Pattern, override val boundaries: Boundaries) : AceVimMode() {
-    override fun setupSession(editor: Editor, session: Session) {
-      session.startRegexSearch(pattern)
-    }
-  }
-}

src/main/kotlin/org/acejump/boundaries/StandardBoundaries.kt

@@ -35,34 +35,21 @@ enum class StandardBoundaries : Boundaries {
   
   BEFORE_CARET {
     override fun getOffsetRange(editor: Editor, cache: EditorOffsetCache): IntRange {
-      return 0 until editor.caretModel.offset
+      return 0..(editor.caretModel.offset)
     }
     
     override fun isOffsetInside(editor: Editor, offset: Int, cache: EditorOffsetCache): Boolean {
-      return offset < editor.caretModel.offset
+      return offset <= editor.caretModel.offset
     }
   },
   
   AFTER_CARET {
     override fun getOffsetRange(editor: Editor, cache: EditorOffsetCache): IntRange {
-      return (editor.caretModel.offset + 1) until editor.document.textLength
+      return editor.caretModel.offset until editor.document.textLength
     }
     
     override fun isOffsetInside(editor: Editor, offset: Int, cache: EditorOffsetCache): Boolean {
-      return offset > editor.caretModel.offset
-    }
-  },
-  
-  CARET_LINE {
-    override fun getOffsetRange(editor: Editor, cache: EditorOffsetCache): IntRange {
-      val document = editor.document
-      val offset = editor.caretModel.offset
-      val line = document.getLineNumber(offset)
-      return document.getLineStartOffset(line)..document.getLineEndOffset(line)
-    }
-  
-    override fun isOffsetInside(editor: Editor, offset: Int, cache: EditorOffsetCache): Boolean {
-      return offset in getOffsetRange(editor, cache)
+      return offset >= editor.caretModel.offset
     }
   }
 }

src/main/kotlin/org/acejump/config/AceConfig.kt

@@ -19,12 +19,14 @@ class AceConfig : PersistentStateComponent<AceSettings> {
       get() = ServiceManager.getService(AceConfig::class.java).aceSettings
     
     val layout get() = settings.layout
-    val minQueryLength get() = settings.minQueryLength
-    val editorFadeOpacity get() = settings.editorFadeOpacity
     val jumpModeColor get() = settings.jumpModeColor
-    val tagForegroundColor1 get() = settings.tagForegroundColor1
-    val tagForegroundColor2 get() = settings.tagForegroundColor2
-    val searchHighlightColor get() = settings.searchHighlightColor
+    val fromCaretModeColor get() = settings.fromCaretModeColor
+    val betweenPointsModeColor get() = settings.betweenPointsModeColor
+    val textHighlightColor get() = settings.textHighlightColor
+    val tagForegroundColor get() = settings.tagForegroundColor
+    val tagBackgroundColor get() = settings.tagBackgroundColor
+    val acceptedTagColor get() = settings.acceptedTagColor
+    val roundedTagCorners get() = settings.roundedTagCorners
   }
   
   override fun getState(): AceSettings {

src/main/kotlin/org/acejump/config/AceConfigurable.kt

@@ -14,22 +14,26 @@ class AceConfigurable : Configurable {
   override fun isModified() =
     panel.allowedChars != settings.allowedChars ||
       panel.keyboardLayout != settings.layout ||
-      panel.minQueryLengthInt != settings.minQueryLength ||
-      panel.editorFadeOpacityPercent != settings.editorFadeOpacity ||
       panel.jumpModeColor != settings.jumpModeColor ||
-      panel.tagForegroundColor1 != settings.tagForegroundColor1 ||
-      panel.tagForegroundColor2 != settings.tagForegroundColor2 ||
-      panel.searchHighlightColor != settings.searchHighlightColor
+      panel.fromCaretModeColor != settings.fromCaretModeColor ||
+      panel.betweenPointsModeColor != settings.betweenPointsModeColor ||
+      panel.textHighlightColor != settings.textHighlightColor ||
+      panel.tagForegroundColor != settings.tagForegroundColor ||
+      panel.tagBackgroundColor != settings.tagBackgroundColor ||
+      panel.acceptedTagColor != settings.acceptedTagColor ||
+      panel.roundedTagCorners != settings.roundedTagCorners
   
   override fun apply() {
     settings.allowedChars = panel.allowedChars
     settings.layout = panel.keyboardLayout
-    settings.minQueryLength = panel.minQueryLengthInt ?: settings.minQueryLength
-    settings.editorFadeOpacity = panel.editorFadeOpacityPercent
     panel.jumpModeColor?.let { settings.jumpModeColor = it }
-    panel.tagForegroundColor1?.let { settings.tagForegroundColor1 = it }
-    panel.tagForegroundColor2?.let { settings.tagForegroundColor2 = it }
-    panel.searchHighlightColor?.let { settings.searchHighlightColor = it }
+    panel.fromCaretModeColor?.let { settings.fromCaretModeColor = it }
+    panel.betweenPointsModeColor?.let { settings.betweenPointsModeColor = it }
+    panel.textHighlightColor?.let { settings.textHighlightColor = it }
+    panel.tagForegroundColor?.let { settings.tagForegroundColor = it }
+    panel.tagBackgroundColor?.let { settings.tagBackgroundColor = it }
+    panel.acceptedTagColor?.let { settings.acceptedTagColor = it }
+    settings.roundedTagCorners = panel.roundedTagCorners
     KeyLayoutCache.reset(settings)
   }
   

src/main/kotlin/org/acejump/config/AceSettings.kt

@@ -8,18 +8,27 @@ import java.awt.Color
 data class AceSettings(
   var layout: KeyLayout = QWERTY,
   var allowedChars: String = layout.allChars,
-  var minQueryLength: Int = 1,
-  var editorFadeOpacity: Int = 70,
   
   @OptionTag("jumpModeRGB", converter = ColorConverter::class)
-  var jumpModeColor: Color = Color(0xFFFFFF),
+  var jumpModeColor: Color = Color.BLUE,
+  
+  @OptionTag("fromCaretModeRGB", converter = ColorConverter::class)
+  var fromCaretModeColor: Color = Color.ORANGE,
+  
+  @OptionTag("betweenPointsModeRGB", converter = ColorConverter::class)
+  var betweenPointsModeColor: Color = Color.YELLOW,
+  
+  @OptionTag("textHighlightRGB", converter = ColorConverter::class)
+  var textHighlightColor: Color = Color.GREEN,
   
   @OptionTag("tagForegroundRGB", converter = ColorConverter::class)
-  var tagForegroundColor1: Color = Color(0xFFFFFF),
+  var tagForegroundColor: Color = Color.BLACK,
   
-  @OptionTag("tagForeground2RGB", converter = ColorConverter::class)
-  var tagForegroundColor2: Color = Color(0xFFFFFF),
+  @OptionTag("tagBackgroundRGB", converter = ColorConverter::class)
+  var tagBackgroundColor: Color = Color.YELLOW,
   
-  @OptionTag("searchHighlightRGB", converter = ColorConverter::class)
-  var searchHighlightColor: Color = Color(0x008299),
+  @OptionTag("acceptedTagRGB", converter = ColorConverter::class)
+  var acceptedTagColor: Color = Color.CYAN,
+  
+  var roundedTagCorners: Boolean = true
 )

src/main/kotlin/org/acejump/config/AceSettingsPanel.kt

@@ -2,21 +2,19 @@ package org.acejump.config
 
 import com.intellij.openapi.ui.ComboBox
 import com.intellij.ui.ColorPanel
-import com.intellij.ui.components.JBSlider
+import com.intellij.ui.components.JBCheckBox
 import com.intellij.ui.components.JBTextArea
 import com.intellij.ui.components.JBTextField
-import com.intellij.ui.dsl.builder.COLUMNS_LARGE
-import com.intellij.ui.dsl.builder.COLUMNS_SHORT
-import com.intellij.ui.dsl.builder.columns
-import com.intellij.ui.dsl.builder.panel
+import com.intellij.ui.layout.Cell
+import com.intellij.ui.layout.GrowPolicy.MEDIUM_TEXT
+import com.intellij.ui.layout.GrowPolicy.SHORT_TEXT
+import com.intellij.ui.layout.panel
 import org.acejump.input.KeyLayout
 import java.awt.Color
 import java.awt.Font
-import java.util.Hashtable
 import javax.swing.JCheckBox
-import javax.swing.JLabel
+import javax.swing.JComponent
 import javax.swing.JPanel
-import javax.swing.JSlider
 import javax.swing.text.JTextComponent
 import kotlin.reflect.KProperty
 
@@ -25,90 +23,78 @@ import kotlin.reflect.KProperty
  */
 @Suppress("UsePropertyAccessSyntax")
 internal class AceSettingsPanel {
-  private val tagAllowedCharsField = JBTextField()
+  private val tagCharsField = JBTextField()
   private val keyboardLayoutCombo = ComboBox<KeyLayout>()
   private val keyboardLayoutArea = JBTextArea().apply { isEditable = false }
-  private val minQueryLengthField = JBTextField()
-  private val editorFadeOpacitySlider = JBSlider(0, 10).apply {
-    labelTable = Hashtable((0..10).associateWith { JLabel("${it * 10}") })
-    paintTrack = true
-    paintLabels = true
-    paintTicks = true
-    minorTickSpacing = 1
-    majorTickSpacing = 1
-  }
   private val jumpModeColorWheel = ColorPanel()
-  private val tagForeground1ColorWheel = ColorPanel()
-  private val tagForeground2ColorWheel = ColorPanel()
-  private val searchHighlightColorWheel = ColorPanel()
+  private val fromCaretModeColorWheel = ColorPanel()
+  private val betweenPointsModeColorWheel = ColorPanel()
+  private val textHighlightColorWheel = ColorPanel()
+  private val tagForegroundColorWheel = ColorPanel()
+  private val tagBackgroundColorWheel = ColorPanel()
+  private val acceptedTagColorWheel = ColorPanel()
+  private val roundedTagCornersCheckBox = JBCheckBox()
   
   init {
-    tagAllowedCharsField.apply { font = Font("monospaced", font.style, font.size) }
+    tagCharsField.apply { font = Font("monospaced", font.style, font.size) }
     keyboardLayoutArea.apply { font = Font("monospaced", font.style, font.size) }
     keyboardLayoutCombo.setupEnumItems { keyChars = it.rows.joinToString("\n") }
   }
   
   internal val rootPanel: JPanel = panel {
-    group("Characters and Layout") {
-      row("Allowed characters in tags:") { cell(tagAllowedCharsField).columns(COLUMNS_LARGE) }
-      row("Keyboard layout:") { cell(keyboardLayoutCombo).columns(COLUMNS_SHORT) }
-      row("Keyboard design:") { cell(keyboardLayoutArea).columns(COLUMNS_SHORT) }
+    fun Cell.short(component: JComponent) = component(growPolicy = SHORT_TEXT)
+    fun Cell.medium(component: JComponent) = component(growPolicy = MEDIUM_TEXT)
+    
+    titledRow("Characters and Layout") {
+      row("Allowed characters in tags:") { medium(tagCharsField) }
+      row("Keyboard layout:") { short(keyboardLayoutCombo) }
+      row("Keyboard design:") { short(keyboardLayoutArea) }
     }
     
-    group("Behavior") {
-      row("Minimum typed characters (1-10):") { cell(minQueryLengthField).columns(COLUMNS_SHORT) }
+    titledRow("Colors") {
+      row("Jump mode caret background:") { short(jumpModeColorWheel) }
+      row("From Caret mode caret background:") { short(fromCaretModeColorWheel) }
+      row("Between Points mode caret background:") { short(betweenPointsModeColorWheel) }
+      row("Searched text background:") { short(textHighlightColorWheel) }
+      row("Tag foreground:") { short(tagForegroundColorWheel) }
+      row("Tag background:") { short(tagBackgroundColorWheel) }
+      row("Accepted tag position background:") { short(acceptedTagColorWheel) }
     }
     
-    group("Colors") {
-      row("Caret background:") {
-        cell(jumpModeColorWheel)
-      }
-      row("Tag foreground:") {
-        cell(tagForeground1ColorWheel)
-        cell(tagForeground2ColorWheel)
-      }
-      row("Search highlight:") {
-        cell(searchHighlightColorWheel)
-      }
-      row("Editor fade opacity (%):") {
-        cell(editorFadeOpacitySlider)
-      }
+    titledRow("Appearance") {
+      row { short(roundedTagCornersCheckBox.apply { text = "Rounded tag corners" }) }
     }
   }
   
   // Property-to-property delegation: https://stackoverflow.com/q/45074596/1772342
-  internal var allowedChars by tagAllowedCharsField
+  internal var allowedChars by tagCharsField
   internal var keyboardLayout by keyboardLayoutCombo
   internal var keyChars by keyboardLayoutArea
-  internal var minQueryLength by minQueryLengthField
-  internal var editorFadeOpacity by editorFadeOpacitySlider
   internal var jumpModeColor by jumpModeColorWheel
-  internal var tagForegroundColor1 by tagForeground1ColorWheel
-  internal var tagForegroundColor2 by tagForeground2ColorWheel
-  internal var searchHighlightColor by searchHighlightColorWheel
-  
-  internal var minQueryLengthInt
-    get() = minQueryLength.toIntOrNull()?.coerceIn(1, 10)
-    set(value) { minQueryLength = value.toString() }
-  
-  internal var editorFadeOpacityPercent
-    get() = editorFadeOpacity * 10
-    set(value) { editorFadeOpacity = value / 10 }
+  internal var fromCaretModeColor by fromCaretModeColorWheel
+  internal var betweenPointsModeColor by betweenPointsModeColorWheel
+  internal var textHighlightColor by textHighlightColorWheel
+  internal var tagForegroundColor by tagForegroundColorWheel
+  internal var tagBackgroundColor by tagBackgroundColorWheel
+  internal var acceptedTagColor by acceptedTagColorWheel
+  internal var roundedTagCorners by roundedTagCornersCheckBox
   
   fun reset(settings: AceSettings) {
     allowedChars = settings.allowedChars
     keyboardLayout = settings.layout
-    minQueryLength = settings.minQueryLength.toString()
-    editorFadeOpacityPercent = settings.editorFadeOpacity
     jumpModeColor = settings.jumpModeColor
-    tagForegroundColor1 = settings.tagForegroundColor1
-    tagForegroundColor2 = settings.tagForegroundColor2
-    searchHighlightColor = settings.searchHighlightColor
+    fromCaretModeColor = settings.fromCaretModeColor
+    betweenPointsModeColor = settings.betweenPointsModeColor
+    textHighlightColor = settings.textHighlightColor
+    tagForegroundColor = settings.tagForegroundColor
+    tagBackgroundColor = settings.tagBackgroundColor
+    acceptedTagColor = settings.acceptedTagColor
+    roundedTagCorners = settings.roundedTagCorners
   }
   
   // Removal pending support for https://youtrack.jetbrains.com/issue/KT-8575
   
-  private operator fun JTextComponent.getValue(a: AceSettingsPanel, p: KProperty<*>) = text.lowercase()
+  private operator fun JTextComponent.getValue(a: AceSettingsPanel, p: KProperty<*>) = text.toLowerCase()
   private operator fun JTextComponent.setValue(a: AceSettingsPanel, p: KProperty<*>, s: String) = setText(s)
   
   private operator fun ColorPanel.getValue(a: AceSettingsPanel, p: KProperty<*>) = selectedColor
@@ -117,9 +103,6 @@ internal class AceSettingsPanel {
   private operator fun JCheckBox.getValue(a: AceSettingsPanel, p: KProperty<*>) = isSelected
   private operator fun JCheckBox.setValue(a: AceSettingsPanel, p: KProperty<*>, selected: Boolean) = setSelected(selected)
   
-  private operator fun JSlider.getValue(a: AceSettingsPanel, p: KProperty<*>) = value
-  private operator fun JSlider.setValue(a: AceSettingsPanel, p: KProperty<*>, value: Int) = setValue(value)
-  
   private operator fun <T> ComboBox<T>.getValue(a: AceSettingsPanel, p: KProperty<*>) = selectedItem as T
   private operator fun <T> ComboBox<T>.setValue(a: AceSettingsPanel, p: KProperty<*>, item: T) = setSelectedItem(item)
   

src/main/kotlin/org/acejump/input/KeyLayout.kt

@@ -4,47 +4,21 @@ package org.acejump.input
  * Defines common keyboard layouts. Each layout has a key priority order, based on each key's distance from the home row and how
  * ergonomically difficult they are to press.
  */
-@Suppress("unused", "SpellCheckingInspection")
-enum class KeyLayout(
-  internal val rows: Array<String>,
-  priority: String,
-  private val characterSides: Pair<Set<Char>, Set<Char>> = Pair(emptySet(), emptySet()),
-  internal val characterRemapping: Map<Char, Char> = emptyMap(),
-) {
+@Suppress("unused")
+enum class KeyLayout(internal val rows: Array<String>, priority: String) {
   COLEMK(arrayOf("1234567890", "qwfpgjluy", "arstdhneio", "zxcvbkm"), priority = "tndhseriaovkcmbxzgjplfuwyq5849673210"),
   WORKMN(arrayOf("1234567890", "qdrwbjfup", "ashtgyneoi", "zxmcvkl"), priority = "tnhegysoaiclvkmxzwfrubjdpq5849673210"),
   DVORAK(arrayOf("1234567890", "pyfgcrl", "aoeuidhtns", "qjkxbmwvz"), priority = "uhetidonasxkbjmqwvzgfycprl5849673210"),
   QWERTY(arrayOf("1234567890", "qwertyuiop", "asdfghjkl", "zxcvbnm"), priority = "fjghdkslavncmbxzrutyeiwoqp5849673210"),
   QWERTZ(arrayOf("1234567890", "qwertzuiop", "asdfghjkl", "yxcvbnm"), priority = "fjghdkslavncmbxyrutzeiwoqp5849673210"),
-  QWERTZ_CZ(
-    arrayOf("1234567890", "qwertzuiop", "asdfghjkl", "yxcvbnm"),
-    priority = "fjghdkslavncmbxyrutzeiwoqp5849673210",
-    characterSides = sides("", ""),
-    characterRemapping = mapOf(
-      '+' to '1',
-      'ě' to '2',
-      'š' to '3',
-      'č' to '4',
-      'ř' to '5',
-      'ž' to '6',
-      'ý' to '7',
-      'á' to '8',
-      'í' to '9',
-      'é' to '0'
-    )
-  ),
   QGMLWY(arrayOf("1234567890", "qgmlwyfub", "dstnriaeoh", "zxcvjkp"), priority = "naterisodhvkcpjxzlfmuwygbq5849673210"),
   QGMLWB(arrayOf("1234567890", "qgmlwbyuv", "dstnriaeoh", "zxcfjkp"), priority = "naterisodhfkcpjxzlymuwbgvq5849673210"),
   NORMAN(arrayOf("1234567890", "qwdfkjurl", "asetgynioh", "zxcvbpm"), priority = "tneigysoahbvpcmxzjkufrdlwq5849673210");
   
   internal val allChars = rows.joinToString("").toCharArray().apply(CharArray::sort).joinToString("")
-  private val allPriorities = priority.mapIndexed { index, char -> char to index }.toMap()
+  internal val allPriorities = priority.mapIndexed { index, char -> char to index }.toMap()
   
-  internal fun priority(): (Char) -> Int {
-    return { allPriorities.getOrDefault(it, Int.MAX_VALUE) }
+  internal inline fun priority(crossinline tagToChar: (String) -> Char): (String) -> Int? {
+    return { allPriorities[tagToChar(it)] }
   }
 }
-
-private fun sides(left: String, right: String): Pair<Set<Char>, Set<Char>> {
-  return Pair(left.toCharArray().toSet(), right.toCharArray().toSet())
-}

src/main/kotlin/org/acejump/input/KeyLayoutCache.kt

@@ -7,14 +7,66 @@ import org.acejump.config.AceSettings
  * with repeated keys (ex. FF, JJ) or adjacent keys (ex. GH, UJ).
  */
 internal object KeyLayoutCache {
-  lateinit var allowedCharsSorted: List<Char>
+  /**
+   * Stores keys ordered by proximity to other keys for the QWERTY layout.
+   * TODO: Support more layouts, perhaps generate automatically.
+   */
+  private val qwertyCharacterDistances = mapOf(
+    'j' to "jikmnhuolbgypvftcdrxsezawq8796054321",
+    'f' to "ftgvcdryhbxseujnzawqikmolp5463728190",
+    'k' to "kolmjipnhubgyvftcdrxsezawq9807654321",
+    'd' to "drfcxsetgvzawyhbqujnikmolp4352617890",
+    'l' to "lkopmjinhubgyvftcdrxsezawq0987654321",
+    's' to "sedxzawrfcqtgvyhbujnikmolp3241567890",
+    'a' to "aqwszedxrfctgvyhbujnikmolp1234567890",
+    'h' to "hujnbgyikmvftolcdrpxsezawq6758493021",
+    'g' to "gyhbvftujncdrikmxseolzawpq5647382910",
+    'y' to "yuhgtijnbvfrokmcdeplxswzaq6758493021",
+    't' to "tygfruhbvcdeijnxswokmzaqpl5647382910",
+    'u' to "uijhyokmnbgtplvfrcdexswzaq7869504321",
+    'r' to "rtfdeygvcxswuhbzaqijnokmpl4536271890",
+    'n' to "nbhjmvgyuiklocftpxdrzseawq7685940321",
+    'v' to "vcfgbxdrtyhnzseujmawikqolp5463728190",
+    'm' to "mnjkbhuilvgyopcftxdrzseawq8970654321",
+    'c' to "cxdfvzsertgbawyhnqujmikolp4352617890",
+    'b' to "bvghncftyujmxdrikzseolawqp6574839201",
+    'i' to "iokjuplmnhybgtvfrcdexswzaq8970654321",
+    'e' to "erdswtfcxzaqygvuhbijnokmpl3425167890",
+    'x' to "xzsdcawerfvqtgbyhnujmikolp3241567890",
+    'z' to "zasxqwedcrfvtgbyhnujmikolp1234567890",
+    'o' to "oplkimjunhybgtvfrcdexswzaq9087654321",
+    'w' to "wesaqrdxztfcygvuhbijnokmpl2314567890",
+    'p' to "plokimjunhybgtvfrcdexswzaq0987654321",
+    'q' to "qwaeszrdxtfcygvuhbijnokmpl1234567890",
+    '1' to "1234567890qawzsexdrcftvgybhunjimkolp",
+    '2' to "2134567890qwasezxdrcftvgybhunjimkolp",
+    '3' to "3241567890weqasdrzxcftvgybhunjimkolp",
+    '4' to "4352617890erwsdftqazxcvgybhunjimkolp",
+    '5' to "5463728190rtedfgywsxcvbhuqaznjimkolp",
+    '6' to "6574839201tyrfghuedcvbnjiwsxmkoqazlp",
+    '7' to "7685940321yutghjirfvbnmkoedclpwsxqaz",
+    '8' to "8796054321uiyhjkotgbnmlprfvedcwsxqaz",
+    '9' to "9807654321ioujklpyhnmtgbrfvedcwsxqaz",
+    '0' to "0987654321opiklujmyhntgbrfvedcwsxqaz").mapValues { (_, v) -> v.mapIndexed { index, char -> char to index }.toMap() }
+  
+  /**
+   * Sorts tags according to current keyboard layout settings, and some predefined rules that force tags with digits, and tags with two
+   * keys far apart, to be sorted after other (easier to type) tags.
+   */
+  lateinit var tagOrder: Comparator<String>
+    private set
+  
+  /**
+   * Returns all possible two key tags, pre-sorted according to [tagOrder].
+   */
+  lateinit var allPossibleTags: List<String>
     private set
   
   /**
    * Called before any lazily initialized properties are used, to ensure that they are initialized even if the settings are missing.
    */
   fun ensureInitialized(settings: AceSettings) {
-    if (!::allowedCharsSorted.isInitialized) {
+    if (!::tagOrder.isInitialized) {
       reset(settings)
     }
   }
@@ -23,17 +75,19 @@ internal object KeyLayoutCache {
    * Re-initializes cached data according to updated settings.
    */
   fun reset(settings: AceSettings) {
-    val allowedCharList = processCharList(settings.allowedChars)
+    tagOrder = compareBy(
+      { it[0].isDigit() || it[1].isDigit() },
+      { qwertyCharacterDistances.getValue(it[0]).getValue(it[1]) },
+      settings.layout.priority { it[0] }
+    )
     
-    allowedCharsSorted = if (allowedCharList.isEmpty()) {
-      processCharList(settings.layout.allChars)
-    }
-    else {
-      allowedCharList.sortedWith(compareBy(settings.layout.priority()))
-    }
-  }
-  
-  private fun processCharList(charList: String): List<Char> {
-    return charList.toCharArray().map(Char::lowercaseChar).distinct()
+    val allPossibleChars = settings.allowedChars
+      .toCharArray()
+      .filter(Char::isLetterOrDigit)
+      .distinct()
+      .joinToString("")
+      .ifEmpty(settings.layout::allChars)
+    
+    allPossibleTags = allPossibleChars.flatMap { a -> allPossibleChars.map { b -> "$a$b".intern() } }.sortedWith(tagOrder)
   }
 }

src/main/kotlin/org/acejump/modes/BetweenPointsMode.kt

@@ -0,0 +1,109 @@
+package org.acejump.modes
+
+import com.intellij.openapi.editor.CaretState
+import org.acejump.action.AceTagAction
+import org.acejump.config.AceConfig
+import org.acejump.session.SessionMode
+import org.acejump.session.SessionState
+import org.acejump.session.TypeResult
+
+class BetweenPointsMode : SessionMode {
+  private companion object {
+    private val HINT_TYPE_TAG = arrayOf(
+      "<b>Type to Search...</b>"
+    )
+    
+    private val HINT_ACTION_MODE = arrayOf(
+      "<h>Between Points Mode</h>",
+      "<f>[S]</f>elect... / <f>[D]</f>elete...",
+      "<f>[C]</f>lone to Caret...",
+      "<f>[M]</f>ove to Caret..."
+    )
+    
+    private val HINT_JUMP_MODE = arrayOf(
+      "<f>[J]</f> at Tag / <f>[L]</f> past Query",
+      "Word <f>[S]</f>tart / Word <f>[E]</f>nd"
+    )
+    
+    private val HINT_JUMP_OR_SELECT_MODE = HINT_JUMP_MODE + arrayOf(
+      "Select <f>[W]</f>ord / <f>[H]</f>ump / <f>[Q]</f>uery / <f>[1-9]</f> Expansion"
+    )
+    
+    private val ACTION_MODE_MAP = mapOf(
+      'S' to ({ action: AceTagAction.BaseSelectAction -> action }),
+      'D' to (AceTagAction::Delete),
+      'C' to (AceTagAction::CloneToCaret),
+      'M' to (AceTagAction::MoveToCaret)
+    )
+    
+    private val JUMP_MODE_MAP = mapOf(
+      'J' to AceTagAction.JumpToSearchStart,
+      'L' to AceTagAction.JumpPastSearchEnd,
+      'S' to AceTagAction.JumpToWordStartTag,
+      'E' to AceTagAction.JumpToWordEndTag
+    )
+    
+    private val SELECTION_MODE_MAP = mapOf(
+      'W' to AceTagAction.SelectWord,
+      'H' to AceTagAction.SelectHump,
+      'Q' to AceTagAction.SelectQuery,
+      *('1'..'9').mapIndexed { index, char -> char to AceTagAction.SelectExtended(index + 1) }.toTypedArray()
+    )
+  }
+  
+  override val caretColor
+    get() = AceConfig.betweenPointsModeColor
+  
+  private var actionMode: ((AceTagAction.BaseSelectAction) -> AceTagAction)? = null
+  private var originalCarets: List<CaretState>? = null
+  private var firstOffset: Int? = null
+  
+  override fun type(state: SessionState, charTyped: Char, acceptedTag: Int?): TypeResult {
+    val actionMode = actionMode
+    if (actionMode == null) {
+      this.actionMode = ACTION_MODE_MAP[charTyped.toUpperCase()]
+      return TypeResult.Nothing
+    }
+    
+    if (acceptedTag == null) {
+      return state.type(charTyped)
+    }
+    
+    if (firstOffset == null) {
+      val selectAction = SELECTION_MODE_MAP[charTyped.toUpperCase()]
+      if (selectAction != null) {
+        state.act(actionMode(selectAction), acceptedTag, shiftMode = charTyped.isUpperCase())
+        return TypeResult.EndSession
+      }
+    }
+    
+    val jumpAction = JUMP_MODE_MAP[charTyped.toUpperCase()]
+    if (jumpAction == null) {
+      return TypeResult.Nothing
+    }
+  
+    val firstOffset = firstOffset
+    if (firstOffset == null) {
+      val caretModel = state.editor.caretModel
+      this.originalCarets = caretModel.caretsAndSelections
+      
+      state.act(jumpAction, acceptedTag, shiftMode = false)
+      this.firstOffset = caretModel.offset
+      return TypeResult.RestartSearch
+    }
+    
+    originalCarets?.let { state.editor.caretModel.caretsAndSelections = it }
+    state.act(actionMode(AceTagAction.SelectBetweenPoints(firstOffset, jumpAction)), acceptedTag, shiftMode = charTyped.isUpperCase())
+    
+    return TypeResult.EndSession
+  }
+  
+  override fun getHint(acceptedTag: Int?): Array<String> {
+    return when {
+      actionMode == null  -> HINT_ACTION_MODE
+      acceptedTag == null -> HINT_TYPE_TAG
+      firstOffset == null -> HINT_JUMP_OR_SELECT_MODE
+      else                -> HINT_JUMP_MODE
+    }
+  }
+}

src/main/kotlin/org/acejump/modes/FromCaretMode.kt

@@ -0,0 +1,74 @@
+package org.acejump.modes
+
+import org.acejump.action.AceTagAction
+import org.acejump.config.AceConfig
+import org.acejump.session.SessionMode
+import org.acejump.session.SessionState
+import org.acejump.session.TypeResult
+
+class FromCaretMode : SessionMode {
+  private companion object {
+    private val HINT_TYPE_TAG = arrayOf(
+      "<b>Type to Search...</b>"
+    )
+    
+    private val HINT_ACTION_MODE = arrayOf(
+      "<h>From Caret Mode</h>",
+      "<f>[S]</f>elect... / <f>[D]</f>elete...",
+      "<f>[X]</f> Cut... / <f>[C]</f>opy... / <f>[P]</f>aste..."
+    )
+    
+    private val HINT_JUMP_MODE = arrayOf(
+      "<f>[J]</f> at Tag / <f>[L]</f> past Query",
+      "Word <f>[S]</f>tart / Word <f>[E]</f>nd"
+    )
+    
+    private val ACTION_MODE_MAP = mapOf(
+      'S' to ({ action: AceTagAction.SelectToCaret -> action }),
+      'D' to (AceTagAction::Delete),
+      'X' to (AceTagAction::Cut),
+      'C' to (AceTagAction::Copy),
+      'P' to (AceTagAction::Paste)
+    )
+    
+    private val JUMP_MODE_MAP = mapOf(
+      'J' to AceTagAction.JumpToSearchStart,
+      'L' to AceTagAction.JumpPastSearchEnd,
+      'S' to AceTagAction.JumpToWordStartTag,
+      'E' to AceTagAction.JumpToWordEndTag
+    )
+  }
+  
+  override val caretColor
+    get() = AceConfig.fromCaretModeColor
+  
+  private var actionMode: ((AceTagAction.SelectToCaret) -> AceTagAction)? = null
+  
+  override fun type(state: SessionState, charTyped: Char, acceptedTag: Int?): TypeResult {
+    val actionMode = actionMode
+    if (actionMode == null) {
+      this.actionMode = ACTION_MODE_MAP[charTyped.toUpperCase()]
+      return TypeResult.Nothing
+    }
+    
+    if (acceptedTag == null) {
+      return state.type(charTyped)
+    }
+    
+    val jumpAction = JUMP_MODE_MAP[charTyped.toUpperCase()]
+    if (jumpAction == null) {
+      return TypeResult.Nothing
+    }
+    
+    state.act(actionMode(AceTagAction.SelectToCaret(jumpAction)), acceptedTag, shiftMode = charTyped.isUpperCase())
+    return TypeResult.EndSession
+  }
+  
+  override fun getHint(acceptedTag: Int?): Array<String>? {
+    return when {
+      actionMode == null  -> HINT_ACTION_MODE
+      acceptedTag == null -> HINT_TYPE_TAG
+      else                -> HINT_JUMP_MODE
+    }
+  }
+}

src/main/kotlin/org/acejump/modes/JumpMode.kt

@@ -2,23 +2,55 @@ package org.acejump.modes
 
 import org.acejump.action.AceTagAction
 import org.acejump.config.AceConfig
-import org.acejump.search.Tag
+import org.acejump.session.SessionMode
 import org.acejump.session.SessionState
 import org.acejump.session.TypeResult
 
-open class JumpMode : SessionMode {
+class JumpMode : SessionMode {
+  private companion object {
+    private val HINT_ACTIONS = arrayOf(
+      "<f>[J]</f>ump to Tag / <f>[L]</f> past Query",
+      "Word <f>[S]</f>tart / <f>[E]</f>nd",
+      "Select <f>[W]</f>ord / <f>[H]</f>ump / <f>[Q]</f>uery / <f>[1-9]</f> Expansion",
+      "<f>[D]</f>eclaration / <f>[U]</f>sages",
+      "<f>[I]</f>ntentions / <f>[R]</f>efactor"
+    )
+    
+    private val ACTION_MAP = mapOf(
+      'J' to AceTagAction.JumpToSearchStart,
+      'L' to AceTagAction.JumpPastSearchEnd,
+      'S' to AceTagAction.JumpToWordStartTag,
+      'E' to AceTagAction.JumpToWordEndTag,
+      'W' to AceTagAction.SelectWord,
+      'H' to AceTagAction.SelectHump,
+      'Q' to AceTagAction.SelectQuery,
+      'D' to AceTagAction.GoToDeclaration,
+      'U' to AceTagAction.ShowUsages,
+      'I' to AceTagAction.ShowIntentions,
+      'R' to AceTagAction.Refactor,
+      *('1'..'9').mapIndexed { index, char -> char to AceTagAction.SelectExtended(index + 1) }.toTypedArray()
+    )
+  }
+  
   override val caretColor
     get() = AceConfig.jumpModeColor
   
-  protected var wasUpperCase = false
-    private set
   
-  override fun type(state: SessionState, charTyped: Char, acceptedTag: Tag?): TypeResult {
-    wasUpperCase = charTyped.isUpperCase()
-    return state.type(charTyped)
+  override fun type(state: SessionState, charTyped: Char, acceptedTag: Int?): TypeResult {
+    if (acceptedTag == null) {
+      return state.type(charTyped)
+    }
+  
+    val action = ACTION_MAP[charTyped.toUpperCase()]
+    if (action != null) {
+      state.act(action, acceptedTag, charTyped.isUpperCase())
+      return TypeResult.EndSession
+    }
+  
+    return TypeResult.Nothing
   }
   
-  override fun accept(state: SessionState, acceptedTag: Tag) {
-    AceTagAction.JumpToSearchStart.invoke(acceptedTag, shiftMode = wasUpperCase, isFinal = true)
+  override fun getHint(acceptedTag: Int?): Array<String>? {
+    return HINT_ACTIONS.takeIf { acceptedTag != null }
   }
 }

src/main/kotlin/org/acejump/modes/SessionMode.kt

@@ -1,13 +0,0 @@
-package org.acejump.modes
-
-import org.acejump.search.Tag
-import org.acejump.session.SessionState
-import org.acejump.session.TypeResult
-import java.awt.Color
-
-interface SessionMode {
-  val caretColor: Color
-  
-  fun type(state: SessionState, charTyped: Char, acceptedTag: Tag?): TypeResult
-  fun accept(state: SessionState, acceptedTag: Tag)
-}

src/main/kotlin/org/acejump/search/Pattern.kt

@@ -4,9 +4,6 @@ enum class Pattern(val regex: String) {
   LINE_STARTS("^.|^\\n"),
   LINE_ENDS("\\n|\\Z"),
   LINE_INDENTS("[^\\s].*|^\\n"),
-  ALL_WORDS("(?<=[^a-zA-Z0-9_]|\\A)[a-zA-Z0-9_]"),
-  VIM_LWORD("(?<=[^a-zA-Z0-9_]|\\A)[a-zA-Z0-9_]"),
-  VIM_UWORD("(?<=\\s|\\A)[^\\s]"),
-  VIM_LWORD_END("[a-zA-Z0-9_](?=[^a-zA-Z0-9_]|\\Z)"),
-  VIM_UWORD_END("[^\\s](?=\\s|\\Z)")
+  LINE_ALL_MARKS(LINE_ENDS.regex + "|" + LINE_STARTS.regex + "|" + LINE_INDENTS.regex),
+  ALL_WORDS("(?<=[^a-zA-Z0-9_]|\\A)[a-zA-Z0-9_]");
 }

src/main/kotlin/org/acejump/search/SearchProcessor.kt

@@ -3,40 +3,42 @@ package org.acejump.search
 import com.intellij.openapi.editor.Editor
 import it.unimi.dsi.fastutil.ints.IntArrayList
 import org.acejump.boundaries.Boundaries
-import org.acejump.clone
-import org.acejump.config.AceConfig
 import org.acejump.immutableText
+import org.acejump.isWordPart
 import org.acejump.matchesAt
 
 /**
- * Searches editor text for matches of a [SearchQuery], and updates previous results when the user [refineQuery]s a character.
+ * Searches editor text for matches of a [SearchQuery], and updates previous results when the user [type]s a character.
  */
-class SearchProcessor private constructor(query: SearchQuery, val boundaries: Boundaries, private val results: MutableMap<Editor, IntArrayList>) {
-  internal constructor(editors: List<Editor>, query: SearchQuery, boundaries: Boundaries) : this(query, boundaries, mutableMapOf()) {
+class SearchProcessor private constructor(private val editor: Editor, query: SearchQuery) {
+  companion object {
+    fun fromChar(editor: Editor, char: Char, boundaries: Boundaries): SearchProcessor {
+      return SearchProcessor(editor, SearchQuery.Literal(char.toString()), boundaries)
+    }
+    
+    fun fromRegex(editor: Editor, pattern: String, boundaries: Boundaries): SearchProcessor {
+      return SearchProcessor(editor, SearchQuery.RegularExpression(pattern), boundaries)
+    }
+  }
+  
+  private constructor(editor: Editor, query: SearchQuery, boundaries: Boundaries) : this(editor, query) {
     val regex = query.toRegex()
     
     if (regex != null) {
-      for (editor in editors) {
-        val offsets = IntArrayList()
+      val offsetRange = boundaries.getOffsetRange(editor)
+      var result = regex.find(editor.immutableText, offsetRange.first)
+      
+      while (result != null) {
+        val index = result.range.first // For some reason regex matches can be out of bounds, but boundary check prevents an exception.
         
-        val offsetRange = boundaries.getOffsetRange(editor)
-        var result = regex.find(editor.immutableText, offsetRange.first)
-        
-        while (result != null) {
-          val index = result.range.first // For some reason regex matches can be out of bounds, but boundary check prevents an exception.
-          val highlightEnd = index + query.getHighlightLength("", index)
-          
-          if (highlightEnd > offsetRange.last) {
-            break
-          }
-          else if (boundaries.isOffsetInside(editor, index) && !editor.foldingModel.isOffsetCollapsed(index)) {
-            offsets.add(index)
-          }
-          
-          result = result.next()
+        if (boundaries.isOffsetInside(editor, index)) {
+          results.add(index)
+        }
+        else if (index > offsetRange.last) {
+          break
         }
         
-        results[editor] = offsets
+        result = result.next()
       }
     }
   }
@@ -44,40 +46,81 @@ class SearchProcessor private constructor(query: SearchQuery, val boundaries: Bo
   internal var query = query
     private set
   
-  val resultsCopy
-    get() = results.clone()
+  internal var results = IntArrayList(0)
+    private set
   
-  val isQueryFinished
-    get() = query.rawText.length >= AceConfig.minQueryLength
-  
-  fun refineQuery(char: Char): Boolean {
-    if (char == '\n') {
-      return true
+  /**
+   * Appends a character to the search query and removes all search results that no longer match the query. If the last typed character
+   * transitioned the search query from a non-word to a word, it notifies the [Tagger] to reassign all tags. If the new query does not
+   * make sense because it would remove every result, the change is reverted and this function returns false.
+   */
+  fun type(char: Char, tagger: Tagger): Boolean {
+    val newQuery = query.rawText + char
+    val chars = editor.immutableText
+    val canMatchTag = tagger.canQueryMatchAnyTag(newQuery)
+    
+    // If the typed character is not compatible with any existing tag or as a continuation of any previous occurrence, reject the query
+    // change and return false to indicate that nothing else should happen.
+    
+    if (newQuery.length > 1 && !canMatchTag && results.none { chars.matchesAt(it, newQuery, ignoreCase = true) }) {
+      return false
+    }
+    
+    // If the typed character transitioned the search query from a non-word to a word, and the typed character does not belong to an
+    // existing tag, we basically restart the search at the beginning of every new word, and unmark existing results so that all tags get
+    // regenerated immediately afterwards. Although this causes tags to change, it is one solution for conflicts between tag characters and
+    // search query characters, and moving searches across word boundaries during search should be fairly uncommon.
+    
+    if (!canMatchTag && newQuery.length >= 2 && !newQuery[newQuery.length - 2].isWordPart && char.isWordPart) {
+      query = SearchQuery.Literal(char.toString())
+      tagger.unmark()
+      
+      val iter = results.iterator()
+      while (iter.hasNext()) {
+        val movedOffset = iter.nextInt() + newQuery.length - 1
+        
+        if (movedOffset < chars.length && chars[movedOffset].equals(char, ignoreCase = true)) {
+          iter.set(movedOffset)
+        }
+        else {
+          iter.remove()
+        }
+      }
     }
     else {
-      query = query.refine(char)
-      removeObsoleteResults()
-      return isQueryFinished
+      removeObsoleteResults(newQuery, tagger)
+      query = SearchQuery.Literal(newQuery)
     }
+    
+    return true
   }
   
   /**
    * After updating the query, removes all results that no longer match the search query.
    */
-  private fun removeObsoleteResults() {
-    val query = query.rawText
+  private fun removeObsoleteResults(newQuery: String, tagger: Tagger) {
+    val lastCharOffset = newQuery.lastIndex
+    val lastChar = newQuery[lastCharOffset]
+    val ignoreCase = newQuery[0].isLowerCase()
+    val chars = editor.immutableText
     
-    for (entry in results) {
-      val editor = entry.key
-      val offsetIter = entry.value.iterator()
+    val remaining = IntArrayList()
+    val iter = results.iterator()
+    
+    while (iter.hasNext()) {
+      val offset = iter.nextInt()
+      val endOffset = offset + lastCharOffset
+      val lastTypedCharMatches = endOffset < chars.length && chars[endOffset].equals(lastChar, ignoreCase)
       
-      while (offsetIter.hasNext()) {
-        val offset = offsetIter.nextInt()
-        
-        if (!editor.immutableText.matchesAt(offset, query, ignoreCase = true)) {
-          offsetIter.remove()
-        }
+      if (lastTypedCharMatches || tagger.isQueryCompatibleWithTagAt(newQuery, offset)) {
+        remaining.add(offset)
       }
     }
+    
+    results = remaining
+  }
+  
+  fun clone(): SearchProcessor {
+    return SearchProcessor(editor, query).also { it.results.addAll(results) }
   }
 }

src/main/kotlin/org/acejump/search/SearchQuery.kt

@@ -8,11 +8,6 @@ import org.acejump.countMatchingCharacters
 internal sealed class SearchQuery {
   abstract val rawText: String
   
-  /**
-   * Returns a new query with the given character appended.
-   */
-  abstract fun refine(char: Char): SearchQuery
-  
   /**
    * Returns how many characters the search occurrence highlight should cover.
    */
@@ -24,37 +19,29 @@ internal sealed class SearchQuery {
   abstract fun toRegex(): Regex?
   
   /**
-   * Searches for all occurrences of a literal text query.
-   * If the first character of the query is lowercase, then the entire query will be case-insensitive,
-   * and only beginnings of words and camel humps will be matched.
+   * Searches for all occurrences of a literal text query. If the first character of the query is lowercase, then the entire query will be
+   * case-insensitive.
+   *
+   * Each occurrence must either match the entire query, or match the query up to a point so that the rest of the query matches the
+   * beginning of a tag at the location of the occurrence.
    */
   class Literal(override val rawText: String) : SearchQuery() {
     init {
       require(rawText.isNotEmpty())
     }
     
-    override fun refine(char: Char): SearchQuery {
-      return Literal(rawText + char)
-    }
-    
     override fun getHighlightLength(text: CharSequence, offset: Int): Int {
       return text.countMatchingCharacters(offset, rawText)
     }
     
     override fun toRegex(): Regex {
-      val firstChar = rawText.first()
-      val pattern = if (firstChar.isLowerCase()) {
-        val fullPattern = Regex.escape(rawText)
-        "(?i)$fullPattern"
-      }
-      else {
-        val firstCharUppercasePattern = Regex.escape(firstChar.toString())
-        val firstCharLowercasePattern = Regex.escape(firstChar.lowercase())
-        val remainingPattern = if (rawText.length > 1) Regex.escape(rawText.drop(1)) else ""
-        "(?:$firstCharUppercasePattern|(?<![a-zA-Z])$firstCharLowercasePattern)$remainingPattern"
+      val options = mutableSetOf(RegexOption.MULTILINE)
+      
+      if (rawText.first().isLowerCase()) {
+        options.add(RegexOption.IGNORE_CASE)
       }
       
-      return Regex(pattern, setOf(RegexOption.MULTILINE))
+      return Regex(Regex.escape(rawText), options)
     }
   }
   
@@ -63,11 +50,7 @@ internal sealed class SearchQuery {
    */
   class RegularExpression(private val pattern: String) : SearchQuery() {
     override val rawText = ""
-    
-    override fun refine(char: Char): SearchQuery {
-      return Literal(char.toString())
-    }
-    
+  
     override fun getHighlightLength(text: CharSequence, offset: Int): Int {
       return 1
     }

src/main/kotlin/org/acejump/search/Solver.kt

@@ -0,0 +1,193 @@
+package org.acejump.search
+
+import com.intellij.openapi.editor.Editor
+import it.unimi.dsi.fastutil.ints.*
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap
+import org.acejump.boundaries.EditorOffsetCache
+import org.acejump.boundaries.StandardBoundaries
+import org.acejump.config.AceConfig
+import org.acejump.immutableText
+import org.acejump.input.KeyLayoutCache
+import org.acejump.isWordPart
+import org.acejump.wordEndPlus
+import java.util.*
+import kotlin.collections.HashMap
+import kotlin.collections.HashSet
+import kotlin.math.max
+
+/*
+ * Solves the Tag Assignment Problem. The tag assignment problem can be stated
+ * thusly: Given a set of indices I in document d, and a set of tags T, find a
+ * bijection f: T*⊂T → I*⊂I s.t. d[i..k] + t ∉ d[i'..(k + |t|)], ∀ i' ∈ I\{i},
+ * ∀ k ∈ (i, |d|-|t|], where t ∈ T, i ∈ I. Maximize |I*|. This can be relaxed
+ * to t=t[0] and ∀ k ∈ (i, i+K] for some fixed K, in most natural documents.
+ *
+ * More concretely, tags are typically two-character strings containing alpha-
+ * numeric symbols. Documents are plaintext files. Indices are produced by a
+ * search query of length N, i.e. the preceding N characters of every index i in
+ * document d are identical. For characters proceeding d[i], all bets are off.
+ * We can assume that P(d[i]|d[i-1]) has some structure for d~D. Ultimately, we
+ * want a fast algorithm which maximizes the number of tagged document indices.
+ *
+ * Tags are used by the typist to select indices within a document. To select an
+ * index, the typist starts by activating AceJump and searching for a character.
+ * As soon as the first character is received, we begin to scan the document for
+ * matching locations and assign as many valid tags as possible. When subsequent
+ * characters are received, we refine the search results to match either:
+ *
+ *    1.) The plaintext query alone, or
+ *    2.) The concatenation of plaintext query and partial tag
+ *
+ * The constraint in paragraph no. 1 tries to impose the following criteria:
+ *
+ *    1.) All valid key sequences will lead to a unique location in the document
+ *    2.) All indices in the document will be reachable by a short key sequence
+ *
+ * If there is an insufficient number of two-character tags to cover every index
+ * (which typically occurs when the user searches for a common character within
+ * a long document), then we attempt to maximize the number of tags assigned to
+ * document indices. The key is, all tags must be assigned as soon as possible,
+ * i.e. as soon as the first character is received or whenever the user ceases
+ * typing (at the very latest). Once assigned, a visible tag must never change
+ * at any time during the selection process, so as not to confuse the user.
+ */
+
+internal class Solver private constructor(
+  private val editor: Editor,
+  private val queryLength: Int,
+  private val newResults: IntList,
+  private val allResults: IntList
+) {
+  companion object {
+    fun solve(
+      editor: Editor, query: SearchQuery, newResults: IntList, allResults: IntList, tags: List<String>, cache: EditorOffsetCache
+    ): Map<String, Int> {
+      return Solver(editor, max(1, query.rawText.length), newResults, allResults).map(tags, cache)
+    }
+  }
+  
+  private var newTags = Object2IntOpenHashMap<String>(KeyLayoutCache.allPossibleTags.size)
+  private val newTagIndices = IntOpenHashSet()
+  
+  private var allWordFragments = HashSet<String>(allResults.size).apply {
+    val iter = allResults.iterator()
+    while (iter.hasNext()) {
+      forEachWordFragment(iter.nextInt()) { add(it) }
+    }
+  }
+  
+  fun map(availableTags: List<String>, cache: EditorOffsetCache): Map<String, Int> {
+    val eligibleSitesByTag = HashMap<String, IntList>(100)
+    val tagsByFirstLetter = availableTags.groupBy { it[0] }
+    
+    val iter = newResults.iterator()
+    while (iter.hasNext()) {
+      val site = iter.nextInt()
+      
+      for ((firstLetter, tags) in tagsByFirstLetter.entries) {
+        if (canTagBeginWithChar(site, firstLetter)) {
+          for (tag in tags) {
+            eligibleSitesByTag.getOrPut(tag) { IntArrayList(10) }.add(site)
+          }
+        }
+      }
+    }
+    
+    val matchingSites = HashMap<IntList, IntArray>()
+    val matchingSitesAsArrays = IdentityHashMap<String, IntArray>() // Keys are guaranteed to be from a single collection.
+    
+    val siteOrder = siteOrder(cache)
+    val tagOrder = KeyLayoutCache.tagOrder
+      .thenComparingInt { eligibleSitesByTag.getValue(it).size }
+      .thenBy(AceConfig.layout.priority(String::last))
+    
+    val sortedTags = eligibleSitesByTag.keys.toMutableList().apply {
+      sortWith(tagOrder)
+    }
+    
+    for ((key, value) in eligibleSitesByTag.entries) {
+      matchingSitesAsArrays[key] = matchingSites.getOrPut(value) {
+        value.toIntArray().apply { IntArrays.mergeSort(this, siteOrder) }
+      }
+    }
+    
+    var totalAssigned = 0
+    
+    for (tag in sortedTags) {
+      if (totalAssigned == newResults.size) {
+        break
+      }
+      
+      if (tryToAssignTag(tag, matchingSitesAsArrays.getValue(tag))) {
+        totalAssigned++
+      }
+    }
+    
+    return newTags
+  }
+  
+  private fun tryToAssignTag(tag: String, sites: IntArray): Boolean {
+    if (newTags.containsKey(tag)) {
+      return false
+    }
+    
+    val index = sites.firstOrNull { it !in newTagIndices } ?: return false
+    
+    @Suppress("ReplacePutWithAssignment")
+    newTags.put(tag, index)
+    newTagIndices.add(index)
+    return true
+  }
+  
+  private fun siteOrder(cache: EditorOffsetCache) = IntComparator { a, b ->
+    val aIsVisible = StandardBoundaries.VISIBLE_ON_SCREEN.isOffsetInside(editor, a, cache)
+    val bIsVisible = StandardBoundaries.VISIBLE_ON_SCREEN.isOffsetInside(editor, b, cache)
+    
+    if (aIsVisible != bIsVisible) {
+      // Sites in immediate view should come first.
+      return@IntComparator if (aIsVisible) -1 else 1
+    }
+    
+    val chars = editor.immutableText
+    val aIsNotWordStart = chars[max(0, a - 1)].isWordPart
+    val bIsNotWordStart = chars[max(0, b - 1)].isWordPart
+    
+    if (aIsNotWordStart != bIsNotWordStart) {
+      // Ensure that the first letter of a word is prioritized for tagging.
+      return@IntComparator if (bIsNotWordStart) -1 else 1
+    }
+    
+    when {
+      a < b -> -1
+      a > b -> 1
+      else  -> 0
+    }
+  }
+  
+  private fun canTagBeginWithChar(site: Int, char: Char): Boolean {
+    if (char.toString() in allWordFragments) {
+      return false
+    }
+    
+    forEachWordFragment(site) {
+      if (it + char in allWordFragments) {
+        return false
+      }
+    }
+    
+    return true
+  }
+  
+  private inline fun forEachWordFragment(site: Int, callback: (String) -> Unit) {
+    val chars = editor.immutableText
+    val left = max(0, site + queryLength - 1)
+    val right = chars.wordEndPlus(site)
+    
+    val builder = StringBuilder(1 + right - left)
+    
+    for (i in left..right) {
+      builder.append(chars[i].toLowerCase())
+      callback(builder.toString())
+    }
+  }
+}

src/main/kotlin/org/acejump/search/Tag.kt

@@ -1,13 +0,0 @@
-package org.acejump.search
-
-import com.intellij.openapi.editor.Editor
-
-data class Tag(val editor: Editor, val offset: Int) {
-  override fun equals(other: Any?): Boolean {
-    return other is Tag && other.offset == offset && other.editor === editor
-  }
-  
-  override fun hashCode(): Int {
-    return (offset * 31) + editor.hashCode()
-  }
-}

src/main/kotlin/org/acejump/search/Tagger.kt

@@ -1,141 +1,202 @@
 package org.acejump.search
 
-import com.google.common.collect.ArrayListMultimap
+import com.google.common.collect.HashBiMap
 import com.intellij.openapi.editor.Editor
+import it.unimi.dsi.fastutil.ints.IntArrayList
 import it.unimi.dsi.fastutil.ints.IntList
+import org.acejump.ExternalUsage
 import org.acejump.boundaries.EditorOffsetCache
-import org.acejump.boundaries.StandardBoundaries.VISIBLE_ON_SCREEN
-import org.acejump.input.KeyLayoutCache
-import org.acejump.view.TagMarker
+import org.acejump.boundaries.StandardBoundaries
+import org.acejump.immutableText
+import org.acejump.input.KeyLayoutCache.allPossibleTags
+import org.acejump.isWordPart
+import org.acejump.matchesAt
+import org.acejump.view.Tag
+import java.util.AbstractMap.SimpleImmutableEntry
 import kotlin.collections.component1
 import kotlin.collections.component2
-import kotlin.math.min
 
 /**
- * Assigns tags to search occurrences.
- * The ordering of [editors] may be used to prioritize tagging editors earlier in the list in case of conflicts.
+ * Assigns tags to search occurrences, updates them when the search query changes, and requests a jump if the search query matches a tag.
  */
-class Tagger(private val editors: List<Editor>, results: Map<Editor, IntList>) {
-  private var tagMap: Map<String, Tag>
-  private var typedTag = ""
+class Tagger(private val editor: Editor) {
+  private var tagMap = HashBiMap.create<String, Int>()
   
-  internal val markers: Map<Editor, Collection<TagMarker>>
-    get() {
-      val markers = ArrayListMultimap.create<Editor, TagMarker>(editors.size, min(tagMap.values.size, 40))
-      
-      for ((mark, tag) in tagMap) {
-        val marker = TagMarker.create(mark, tag.offset, typedTag)
-        markers.put(tag.editor, marker)
-      }
-      
-      return markers.asMap()
-    }
+  val hasTags
+    get() = tagMap.isNotEmpty()
   
-  init {
-    val caches = results.keys.associateWith { EditorOffsetCache.new() }
+  @ExternalUsage
+  internal val tags
+    get() = tagMap.map { SimpleImmutableEntry(it.key, it.value) }.sortedBy { it.value }
     
-    sortResults(results, caches)
-    
-    val tagSites = results
-      .flatMap { (editor, sites) -> sites.map { site -> Tag(editor, site) } }
-      .sortedWith(siteOrder(editors, caches))
-    
-    tagMap = generateTags(tagSites).zip(tagSites).toMap()
+  /**
+   * Removes all markers, allowing them to be regenerated from scratch.
+   */
+  internal fun unmark() {
+    tagMap = HashBiMap.create()
   }
   
-  internal fun type(char: Char): TaggingResult {
-    val newTypedTag = typedTag + char.lowercaseChar()
-    val matchingTag = tagMap[newTypedTag]
-    if (matchingTag != null) {
-      return TaggingResult.Accept(matchingTag)
+  /**
+   * Assigns tags to as many results as possible, keeping previously assigned tags. Returns a [TaggingResult.Accept] if the current search
+   * query matches any existing tag and we should jump to it and end the session, or [TaggingResult.Mark] to continue the session with
+   * updated tag markers.
+   *
+   * Note that the [results] collection will be mutated.
+   */
+  internal fun update(query: SearchQuery, results: IntList): TaggingResult {
+    val isRegex = query is SearchQuery.RegularExpression
+    val queryText = if (isRegex) " ${query.rawText}" else query.rawText[0] + query.rawText.drop(1).toLowerCase()
+    
+    val availableTags = allPossibleTags.filter { !queryText.endsWith(it[0]) && it !in tagMap }
+    
+    if (!isRegex) {
+      for (entry in tagMap.entries) {
+        if (entry solves queryText) {
+          return TaggingResult.Accept(entry.value)
+        }
+      }
+      
+      if (queryText.length == 1) {
+        removeResultsWithOverlappingTags(results)
+      }
     }
     
-    val newTagMap = tagMap.filter { it.key.startsWith(newTypedTag) }
-    if (newTagMap.isEmpty()) {
-      return TaggingResult.Nothing
+    if (!isRegex || tagMap.isEmpty()) {
+      tagMap = assignTagsAndMerge(results, availableTags, query, queryText)
     }
     
-    typedTag = newTypedTag
-    tagMap = newTagMap
-    return TaggingResult.Mark(markers)
+    return TaggingResult.Mark(createTagMarkers(results, query.rawText.ifEmpty { null }))
+  }
+  
+  fun clone(): Tagger {
+    return Tagger(editor).also { it.tagMap.putAll(tagMap) }
+  }
+  
+  /**
+   * Assigns as many unassigned tags as possible, and merges them with the existing compatible tags.
+   */
+  private fun assignTagsAndMerge(results: IntList, availableTags: List<String>, query: SearchQuery, queryText: String): HashBiMap<String, Int> {
+    val cache = EditorOffsetCache.new()
+    
+    results.sort { a, b ->
+      val aIsVisible = StandardBoundaries.VISIBLE_ON_SCREEN.isOffsetInside(editor, a, cache)
+      val bIsVisible = StandardBoundaries.VISIBLE_ON_SCREEN.isOffsetInside(editor, b, cache)
+      
+      when {
+        aIsVisible && !bIsVisible -> -1
+        bIsVisible && !aIsVisible -> 1
+        else                      -> 0
+      }
+    }
+    
+    val allAssignedTags = mutableMapOf<String, Int>()
+    val oldCompatibleTags = tagMap.filter { isTagCompatibleWithQuery(it.key, it.value, queryText) || it.value in results }
+    val vacantResults: IntList
+    
+    if (oldCompatibleTags.isEmpty()) {
+      vacantResults = results
+    }
+    else {
+      vacantResults = IntArrayList()
+      
+      val iter = results.iterator()
+      while (iter.hasNext()) {
+        val offset = iter.nextInt()
+    
+        if (offset !in oldCompatibleTags.values) {
+          vacantResults.add(offset)
+        }
+      }
+    }
+    
+    allAssignedTags.putAll(oldCompatibleTags)
+    allAssignedTags.putAll(Solver.solve(editor, query, vacantResults, results, availableTags, cache))
+    
+    return allAssignedTags.mapKeysTo(HashBiMap.create(allAssignedTags.size)) { (tag, _) ->
+      // Avoid matching query - will trigger a jump.
+      // TODO: lift this constraint.
+      val queryEndsWith = queryText.endsWith(tag[0]) || queryText.endsWith(tag)
+      
+      if (!queryEndsWith && canShortenTag(tag, allAssignedTags))
+        tag[0].toString()
+      else
+        tag
+    }
+  }
+  
+  private infix fun Map.Entry<String, Int>.solves(query: String): Boolean {
+    return query.endsWith(key, true) && isTagCompatibleWithQuery(key, value, query)
+  }
+  
+  private fun isTagCompatibleWithQuery(tag: String, offset: Int, query: String): Boolean {
+    return editor.immutableText.matchesAt(offset, getPlaintextPortion(query, tag), ignoreCase = true)
+  }
+  
+  fun isQueryCompatibleWithTagAt(query: String, offset: Int): Boolean {
+    return tagMap.inverse()[offset].let { it != null && isTagCompatibleWithQuery(it, offset, query) }
+  }
+  
+  fun canQueryMatchAnyTag(query: String): Boolean {
+    return tagMap.any { (tag, offset) ->
+      val tagPortion = getTagPortion(query, tag)
+      tagPortion.isNotEmpty() && tag.startsWith(tagPortion, ignoreCase = true) && isTagCompatibleWithQuery(tag, offset, query)
+    }
+  }
+  
+  private fun removeResultsWithOverlappingTags(results: IntList) {
+    val iter = results.iterator()
+    val chars = editor.immutableText
+    
+    while (iter.hasNext()) {
+      if (!chars.canTagWithoutOverlap(iter.nextInt())) {
+        iter.remove() // Very uncommon, so slow removal is fine.
+      }
+    }
+  }
+  
+  private fun createTagMarkers(results: IntList, literalQueryText: String?): List<Tag> {
+    val tagMapInv = tagMap.inverse()
+    return results.mapNotNull { index -> tagMapInv[index]?.let { tag -> Tag.create(editor, tag, index, literalQueryText) } }
   }
   
   private companion object {
-    private fun generateTags(tagSites: List<Tag>): List<String> {
-      val allowedChars = KeyLayoutCache.allowedCharsSorted
-      
-      val tags = mutableListOf<String>()
-      var remainingTagCount = tagSites.size
-      
-      outer@ for (i in allowedChars.indices) {
-        val c1 = allowedChars[i]
-        
-        if (remainingTagCount <= allowedChars.size - i) {
-          tags.add(c1.toString())
-          if (--remainingTagCount <= 0) {
-            break@outer
-          }
-        }
-        else {
-          for (c2 in allowedChars) {
-            tags.add("$c1$c2")
-            
-            if (--remainingTagCount <= 0) {
-              break@outer
-            }
-          }
-        }
-      }
-      
-      return tags
+    private fun CharSequence.canTagWithoutOverlap(loc: Int) = when {
+      loc - 1 < 0                                                                             -> true
+      loc + 1 >= length                                                                       -> true
+      this[loc] isUnlike this[loc - 1]                                                        -> true
+      this[loc] isUnlike this[loc + 1]                                                        -> true
+      this[loc] != this[loc - 1]                                                              -> true
+      this[loc] != this[loc + 1]                                                              -> true
+      this[loc + 1] == '\r' || this[loc + 1] == '\n'                                          -> true
+      this[loc - 1] == this[loc] && this[loc] == this[loc + 1]                                -> false
+      this[loc + 1].isWhitespace() && this[(loc + 2).coerceAtMost(length - 1)].isWhitespace() -> true
+      else                                                                                    -> false
     }
     
-    private fun sortResults(results: Map<Editor, IntList>, caches: Map<Editor, EditorOffsetCache>) {
-      for ((editor, offsets) in results) {
-        val cache = caches.getValue(editor)
-        
-        offsets.sort { a, b ->
-          val aIsVisible = VISIBLE_ON_SCREEN.isOffsetInside(editor, a, cache)
-          val bIsVisible = VISIBLE_ON_SCREEN.isOffsetInside(editor, b, cache)
-          
-          when {
-            aIsVisible && !bIsVisible -> -1
-            bIsVisible && !aIsVisible -> 1
-            else                      -> 0
-          }
-        }
-      }
+    private infix fun Char.isUnlike(other: Char): Boolean {
+      return this.isWordPart xor other.isWordPart || this.isWhitespace() xor other.isWhitespace()
     }
     
-    private fun siteOrder(editorPriority: List<Editor>, caches: Map<Editor, EditorOffsetCache>) = Comparator<Tag> { a, b ->
-      val aEditor = a.editor
-      val bEditor = b.editor
-      
-      if (aEditor !== bEditor) {
-        val aEditorIndex = editorPriority.indexOf(aEditor)
-        val bEditorIndex = editorPriority.indexOf(bEditor)
-        // For multiple editors, prioritize them based on the provided order.
-        return@Comparator if (aEditorIndex < bEditorIndex) -1 else 1
+    private fun getPlaintextPortion(query: String, tag: String) = when {
+      query.endsWith(tag, true)         -> query.dropLast(tag.length)
+      query.endsWith(tag.first(), true) -> query.dropLast(1)
+      else                              -> query
+    }
+  
+    private fun getTagPortion(query: String, tag: String) = when {
+      query.endsWith(tag, true)         -> query.takeLast(tag.length)
+      query.endsWith(tag.first(), true) -> query.takeLast(1)
+      else                              -> ""
+    }
+    
+    private fun canShortenTag(tag: String, tagMap: Map<String, Int>): Boolean {
+      for (other in tagMap.keys) {
+        if (tag != other && tag[0] == other[0]) {
+          return false
+        }
       }
       
-      val aCaches = caches.getValue(aEditor)
-      val bCaches = caches.getValue(bEditor)
-      
-      val aIsVisible = VISIBLE_ON_SCREEN.isOffsetInside(aEditor, a.offset, aCaches)
-      val bIsVisible = VISIBLE_ON_SCREEN.isOffsetInside(bEditor, b.offset, bCaches)
-      if (aIsVisible != bIsVisible) {
-        // Sites in immediate view should come first.
-        return@Comparator if (aIsVisible) -1 else 1
-      }
-      
-      val aPosition = aCaches.offsetToXY(aEditor, a.offset)
-      val bPosition = bCaches.offsetToXY(bEditor, b.offset)
-      
-      val caretPosition = editorPriority[0].offsetToXY(editorPriority[0].caretModel.offset)
-      val aDistance = aPosition.distanceSq(caretPosition)
-      val bDistance = bPosition.distanceSq(caretPosition)
-      
-      return@Comparator aDistance.compareTo(bDistance)
+      return true
     }
   }
 }

src/main/kotlin/org/acejump/search/TaggingResult.kt

@@ -1,10 +1,8 @@
 package org.acejump.search
 
-import com.intellij.openapi.editor.Editor
-import org.acejump.view.TagMarker
+import org.acejump.view.Tag
 
 internal sealed class TaggingResult {
-  object Nothing : TaggingResult()
-  class Accept(val tag: Tag) : TaggingResult()
-  class Mark(val markers: Map<Editor, Collection<TagMarker>>) : TaggingResult()
+  class Accept(val offset: Int) : TaggingResult()
+  class Mark(val tags: List<Tag>) : TaggingResult()
 }

src/main/kotlin/org/acejump/session/Session.kt

@@ -1,148 +1,176 @@
 package org.acejump.session
 
+import com.intellij.codeInsight.hint.HintManager
 import com.intellij.codeInsight.hint.HintManagerImpl
+import com.intellij.codeInsight.hint.HintUtil
+import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.ScrollType
+import com.intellij.openapi.editor.actionSystem.TypedActionHandler
 import com.intellij.openapi.editor.colors.EditorColors
 import com.intellij.openapi.editor.colors.impl.AbstractColorsScheme
-import it.unimi.dsi.fastutil.ints.IntList
+import com.intellij.ui.LightweightHint
+import org.acejump.ExternalUsage
 import org.acejump.boundaries.Boundaries
-import org.acejump.boundaries.StandardBoundaries
 import org.acejump.config.AceConfig
 import org.acejump.input.EditorKeyListener
 import org.acejump.input.KeyLayoutCache
+import org.acejump.modes.BetweenPointsMode
+import org.acejump.modes.FromCaretMode
 import org.acejump.modes.JumpMode
-import org.acejump.modes.SessionMode
-import org.acejump.search.Pattern
-import org.acejump.search.SearchProcessor
-import org.acejump.search.SearchQuery
-import org.acejump.search.Tag
-import org.acejump.session.TypeResult.AcceptTag
-import org.acejump.session.TypeResult.ChangeMode
-import org.acejump.session.TypeResult.ChangeState
-import org.acejump.session.TypeResult.EndSession
-import org.acejump.session.TypeResult.Nothing
+import org.acejump.search.*
 import org.acejump.view.TagCanvas
-import org.acejump.view.TagMarker
 import org.acejump.view.TextHighlighter
 
 /**
  * Manages an AceJump session for a single [Editor].
  */
-class Session(private val mainEditor: Editor, private val jumpEditors: List<Editor>) {
-  private val editorSettings = EditorSettings.setup(mainEditor)
+class Session(private val editor: Editor) {
+  private val editorSettings = EditorSettings.setup(editor)
   private lateinit var mode: SessionMode
   
   private var state: SessionState? = null
+  private var tagger = Tagger(editor)
   
-  private var acceptedTag: Tag? = null
+  private var acceptedTag: Int? = null
     set(value) {
       field = value
       
       if (value != null) {
-        tagCanvases.values.forEach(TagCanvas::removeMarkers)
-        editorSettings.onTagAccepted(mainEditor)
+        tagCanvas.removeMarkers()
+        editorSettings.onTagAccepted(editor)
       }
     }
   
-  private val textHighlighter = TextHighlighter()
-  private val tagCanvases = jumpEditors.associateWith(::TagCanvas)
+  private val textHighlighter = TextHighlighter(editor)
+  private val tagCanvas = TagCanvas(editor)
   
-  var defaultBoundary: Boundaries = StandardBoundaries.VISIBLE_ON_SCREEN
-  
-  private val actions = object : SessionActions {
-    override fun showHighlights(results: Map<Editor, IntList>, query: SearchQuery) {
-      textHighlighter.renderOccurrences(results, query)
-    }
-    
-    override fun hideHighlights() {
-      textHighlighter.reset()
-    }
-    
-    override fun setTagMarkers(markers: Map<Editor, Collection<TagMarker>>) {
-      for ((editor, canvas) in tagCanvases) {
-        canvas.setMarkers(markers[editor].orEmpty())
-      }
-    }
-  }
+  @ExternalUsage
+  val tags
+    get() = tagger.tags
   
   init {
     KeyLayoutCache.ensureInitialized(AceConfig.settings)
-    EditorKeyListener.attach(mainEditor) { editor, charTyped, _ -> typeCharacter(editor, charTyped) }
+    
+    EditorKeyListener.attach(editor, object : TypedActionHandler {
+      override fun execute(editor: Editor, charTyped: Char, context: DataContext) {
+        val state = state ?: return
+        val hadTags = tagger.hasTags
+        
+        editorSettings.startEditing(editor)
+        val result = mode.type(state, charTyped, acceptedTag)
+        editorSettings.stopEditing(editor)
+        
+        when (result) {
+          TypeResult.Nothing          -> updateHint()
+          TypeResult.RestartSearch    -> restart().also { this@Session.state = SessionState(editor, tagger); updateHint() }
+          is TypeResult.UpdateResults -> updateSearch(result.processor, markImmediately = hadTags)
+          is TypeResult.ChangeMode    -> setMode(result.mode)
+          TypeResult.EndSession       -> end()
+        }
+      }
+    })
   }
   
-  private fun typeCharacter(editor: Editor, charTyped: Char) {
-    val state = state ?: return
+  /**
+   * Updates text highlights and tag markers according to the current search state. Dispatches jumps if the search query matches a tag.
+   * If all tags are outside view, scrolls to the closest one.
+   */
+  private fun updateSearch(processor: SearchProcessor, markImmediately: Boolean) {
+    val query = processor.query
+    val results = processor.results
     
-    editorSettings.startEditing(editor)
-    val result = mode.type(state, charTyped, acceptedTag)
-    editorSettings.stopEditing(editor)
+    if (query is SearchQuery.Literal && !markImmediately && query.rawText.let { it.length < 2 && it.all(Char::isLetterOrDigit) }) {
+      textHighlighter.renderOccurrences(results, query)
+      return
+    }
     
-    when (result) {
-      Nothing        -> return
-      is ChangeState -> this.state = result.state
-      is ChangeMode  -> setMode(result.mode)
-      
-      is AcceptTag   -> {
-        acceptedTag = result.tag
-        mode.accept(state, result.tag)
-        end()
+    when (val result = tagger.update(query, results.clone())) {
+      is TaggingResult.Accept -> {
+        val offset = result.offset
+        acceptedTag = offset
+        textHighlighter.renderFinal(offset, processor.query)
       }
       
-      EndSession     -> end()
+      is TaggingResult.Mark -> {
+        val tags = result.tags
+        tagCanvas.setMarkers(tags, isRegex = query is SearchQuery.RegularExpression)
+        textHighlighter.renderOccurrences(results, query)
+      }
     }
+    
+    updateHint()
   }
   
   private fun setMode(mode: SessionMode) {
     this.mode = mode
-    mainEditor.colorsScheme.setColor(EditorColors.CARET_COLOR, mode.caretColor)
+    editor.colorsScheme.setColor(EditorColors.CARET_COLOR, mode.caretColor)
+    updateHint()
   }
   
-  fun startJumpMode() {
-    startJumpMode(::JumpMode)
+  private fun updateHint() {
+    val hintArray = mode.getHint(acceptedTag) ?: return
+    val hintText = hintArray
+      .joinToString("\n")
+      .replace("<f>", "<span style=\"font-family:'${editor.colorsScheme.editorFontName}';font-weight:bold\">")
+      .replace("</f>", "</span>")
+      .replace("<h>", "<b><u>")
+      .replace("</h>", "</u></b>")
+    
+    val hint = LightweightHint(HintUtil.createInformationLabel(hintText))
+    val pos = acceptedTag?.let(editor::offsetToLogicalPosition) ?: editor.caretModel.logicalPosition
+    val point = HintManagerImpl.getHintPosition(hint, editor, pos, HintManager.ABOVE)
+    val info = HintManagerImpl.createHintHint(editor, point, hint, HintManager.ABOVE).setShowImmediately(true)
+    val flags = HintManager.UPDATE_BY_SCROLLING or HintManager.HIDE_BY_ESCAPE
+    HintManagerImpl.getInstanceImpl().showEditorHint(hint, editor, point, flags, 0, true, info)
   }
   
-  fun startJumpMode(mode: () -> JumpMode) {
-    if (this::mode.isInitialized && mode is JumpMode) {
-      end()
+  fun cycleMode() {
+    if (!this::mode.isInitialized) {
+      setMode(JumpMode())
+      state = SessionState(editor, tagger)
       return
     }
     
-    if (this::mode.isInitialized) {
-      restart()
-    }
+    restart()
+    setMode(when (mode) {
+      is JumpMode      -> FromCaretMode()
+      is FromCaretMode -> BetweenPointsMode()
+      else             -> JumpMode()
+    })
     
-    setMode(mode())
-    state = SessionState.WaitForKey(actions, jumpEditors, defaultBoundary)
+    state = SessionState(editor, tagger)
   }
   
   /**
    * Starts a regular expression search. If a search was already active, it will be reset alongside its tags and highlights.
    */
-  fun startRegexSearch(pattern: Pattern) {
-    if (!this::mode.isInitialized) {
-      setMode(JumpMode())
+  fun startRegexSearch(pattern: String, boundaries: Boundaries) {
+    if (this::mode.isInitialized) {
+      end()
+      return
     }
     
-    for (canvas in tagCanvases.values) {
-      canvas.setMarkers(emptyList())
-    }
+    setMode(JumpMode())
+    tagger = Tagger(editor)
+    tagCanvas.setMarkers(emptyList(), isRegex = true)
     
-    val processor = SearchProcessor(jumpEditors, SearchQuery.RegularExpression(pattern.regex), defaultBoundary)
-    textHighlighter.renderOccurrences(processor.resultsCopy, processor.query)
-    
-    state = SessionState.SelectTag(actions, jumpEditors, processor)
+    val processor = SearchProcessor.fromRegex(editor, pattern, boundaries).also { state = SessionState(editor, tagger, it) }
+    updateSearch(processor, markImmediately = true)
   }
   
-  fun tagImmediately() {
-    typeCharacter(mainEditor, '\n')
+  /**
+   * Starts a regular expression search. If a search was already active, it will be reset alongside its tags and highlights.
+   */
+  fun startRegexSearch(pattern: Pattern, boundaries: Boundaries) {
+    startRegexSearch(pattern.regex, boundaries)
   }
   
   /**
    * Ends this session.
    */
   fun end() {
-    SessionManager.end(mainEditor)
+    SessionManager.end(editor)
   }
   
   /**
@@ -150,31 +178,31 @@ class Session(private val mainEditor: Editor, private val jumpEditors: List<Edit
    */
   fun restart() {
     state = null
+    tagger = Tagger(editor)
     acceptedTag = null
-    tagCanvases.values.forEach(TagCanvas::removeMarkers)
+    tagCanvas.removeMarkers()
     textHighlighter.reset()
     
     HintManagerImpl.getInstanceImpl().hideAllHints()
-    editorSettings.onTagUnaccepted(mainEditor)
-    mainEditor.colorsScheme.setColor(EditorColors.CARET_COLOR, mode.caretColor)
-    jumpEditors.forEach { it.contentComponent.repaint() }
+    editorSettings.onTagUnaccepted(editor)
+    editor.colorsScheme.setColor(EditorColors.CARET_COLOR, mode.caretColor)
+    editor.contentComponent.repaint()
   }
   
   /**
    * Should only be used from [SessionManager] to dispose a successfully ended session.
    */
   internal fun dispose() {
-    tagCanvases.values.forEach(TagCanvas::unbind)
+    tagger = Tagger(editor)
+    tagCanvas.unbind()
     textHighlighter.reset()
-    EditorKeyListener.detach(mainEditor)
+    EditorKeyListener.detach(editor)
     
-    if (!mainEditor.isDisposed) {
+    if (!editor.isDisposed) {
       HintManagerImpl.getInstanceImpl().hideAllHints()
-      editorSettings.restore(mainEditor)
-      mainEditor.colorsScheme.setColor(EditorColors.CARET_COLOR, AbstractColorsScheme.INHERITED_COLOR_MARKER)
-      
-      val focusedEditor = acceptedTag?.editor ?: mainEditor
-      focusedEditor.scrollingModel.scrollToCaret(ScrollType.MAKE_VISIBLE)
+      editorSettings.restore(editor)
+      editor.colorsScheme.setColor(EditorColors.CARET_COLOR, AbstractColorsScheme.INHERITED_COLOR_MARKER)
+      editor.scrollingModel.scrollToCaret(ScrollType.MAKE_VISIBLE)
     }
   }
 }

src/main/kotlin/org/acejump/session/SessionActions.kt

@@ -1,13 +0,0 @@
-package org.acejump.session
-
-import com.intellij.openapi.editor.Editor
-import it.unimi.dsi.fastutil.ints.IntList
-import org.acejump.search.SearchQuery
-import org.acejump.view.TagMarker
-
-internal interface SessionActions {
-  fun showHighlights(results: Map<Editor, IntList>, query: SearchQuery)
-  fun hideHighlights()
-  
-  fun setTagMarkers(markers: Map<Editor, Collection<TagMarker>>)
-}

src/main/kotlin/org/acejump/session/SessionManager.kt

@@ -16,16 +16,7 @@ object SessionManager {
    * Starts a new [Session], or returns an existing [Session] if the specified [Editor] already has one.
    */
   fun start(editor: Editor): Session {
-    return start(editor, listOf(editor))
-  }
-  
-  /**
-   * Starts a new multi-editor [Session], or returns an existing [Session] if the specified main [Editor] already has one.
-   * The [mainEditor] is used for typing the search query and tag.
-   * The [jumpEditors] are all editors that will be searched and tagged.
-   */
-  fun start(mainEditor: Editor, jumpEditors: List<Editor>): Session {
-    return sessions.getOrPut(mainEditor) { cleanup(); Session(mainEditor, jumpEditors) }
+    return sessions.getOrPut(editor) { cleanup(); Session(editor) }
   }
   
   /**

src/main/kotlin/org/acejump/session/SessionMode.kt

@@ -0,0 +1,10 @@
+package org.acejump.session
+
+import java.awt.Color
+
+interface SessionMode {
+  val caretColor: Color
+  
+  fun type(state: SessionState, charTyped: Char, acceptedTag: Int?): TypeResult
+  fun getHint(acceptedTag: Int?): Array<String>?
+}

src/main/kotlin/org/acejump/session/SessionState.kt

@@ -1,90 +1,30 @@
 package org.acejump.session
 
 import com.intellij.openapi.editor.Editor
-import org.acejump.boundaries.Boundaries
+import org.acejump.action.AceTagAction
 import org.acejump.boundaries.StandardBoundaries
-import org.acejump.config.AceConfig
 import org.acejump.search.SearchProcessor
-import org.acejump.search.SearchQuery
 import org.acejump.search.Tagger
-import org.acejump.search.TaggingResult
 
-sealed interface SessionState {
-  fun type(char: Char): TypeResult
+class SessionState(val editor: Editor, private val tagger: Tagger, processor: SearchProcessor? = null) {
+  private var currentProcessor: SearchProcessor? = processor
   
-  class WaitForKey internal constructor(
-    private val actions: SessionActions,
-    private val jumpEditors: List<Editor>,
-    private val defaultBoundary: Boundaries,
-  ) : SessionState {
-    override fun type(char: Char): TypeResult {
-      val searchProcessor = SearchProcessor(jumpEditors, SearchQuery.Literal(char.toString()), defaultBoundary)
-      
-      return if (searchProcessor.isQueryFinished) {
-        TypeResult.ChangeState(SelectTag(actions, jumpEditors, searchProcessor))
-      }
-      else {
-        TypeResult.ChangeState(RefineSearchQuery(actions, jumpEditors, searchProcessor))
-      }
+  fun type(char: Char): TypeResult {
+    val processor = currentProcessor
+    
+    if (processor == null) {
+      val newProcessor = SearchProcessor.fromChar(editor, char, StandardBoundaries.VISIBLE_ON_SCREEN)
+      return TypeResult.UpdateResults(newProcessor.also { currentProcessor = it })
     }
+    
+    if (processor.type(char, tagger)) {
+      return TypeResult.UpdateResults(processor)
+    }
+    
+    return TypeResult.Nothing
   }
   
-  class RefineSearchQuery internal constructor(
-    private val actions: SessionActions,
-    private val jumpEditors: List<Editor>,
-    private val searchProcessor: SearchProcessor,
-  ) : SessionState {
-    init {
-      actions.showHighlights(searchProcessor.resultsCopy, searchProcessor.query)
-    }
-    
-    override fun type(char: Char): TypeResult {
-      return if (searchProcessor.refineQuery(char)) {
-        actions.hideHighlights()
-        TypeResult.ChangeState(SelectTag(actions, jumpEditors, searchProcessor))
-      }
-      else {
-        actions.showHighlights(searchProcessor.resultsCopy, searchProcessor.query)
-        TypeResult.Nothing
-      }
-    }
-  }
-  
-  class SelectTag internal constructor(
-    private val actions: SessionActions,
-    private val jumpEditors: List<Editor>,
-    private val searchProcessor: SearchProcessor,
-  ) : SessionState {
-    private val tagger = Tagger(jumpEditors, searchProcessor.resultsCopy)
-    
-    init {
-      actions.setTagMarkers(tagger.markers)
-    }
-    
-    override fun type(char: Char): TypeResult {
-      if (char == ' ') {
-        val query = searchProcessor.query
-        if (query is SearchQuery.Literal) {
-          val newBoundaries = when (searchProcessor.boundaries) {
-            StandardBoundaries.VISIBLE_ON_SCREEN -> StandardBoundaries.AFTER_CARET
-            StandardBoundaries.AFTER_CARET       -> StandardBoundaries.BEFORE_CARET
-            StandardBoundaries.BEFORE_CARET      -> StandardBoundaries.VISIBLE_ON_SCREEN
-            else                                 -> searchProcessor.boundaries
-          }
-          
-          val newSearchProcessor = SearchProcessor(jumpEditors, query, newBoundaries)
-          return TypeResult.ChangeState(SelectTag(actions, jumpEditors, newSearchProcessor))
-        }
-      }
-      
-      return when (val result = tagger.type(AceConfig.layout.characterRemapping.getOrDefault(char, char))) {
-        is TaggingResult.Nothing -> TypeResult.Nothing
-        is TaggingResult.Accept  -> TypeResult.AcceptTag(result.tag)
-        is TaggingResult.Mark    -> {
-          actions.setTagMarkers(result.markers)
-          TypeResult.Nothing
-        }
-      }
-    }
+  fun act(action: AceTagAction, offset: Int, shiftMode: Boolean) {
+    currentProcessor?.let { action(editor, it, offset, shiftMode) }
   }
 }

src/main/kotlin/org/acejump/session/TypeResult.kt

@@ -1,12 +1,11 @@
 package org.acejump.session
 
-import org.acejump.modes.SessionMode
-import org.acejump.search.Tag
+import org.acejump.search.SearchProcessor
 
 sealed class TypeResult {
   object Nothing : TypeResult()
-  class ChangeState(val state: SessionState) : TypeResult()
+  object RestartSearch : TypeResult()
+  class UpdateResults(val processor: SearchProcessor) : TypeResult()
   class ChangeMode(val mode: SessionMode) : TypeResult()
-  class AcceptTag(val tag: Tag) : TypeResult()
   object EndSession : TypeResult()
 }

src/main/kotlin/org/acejump/view/Tag.kt

@@ -0,0 +1,139 @@
+package org.acejump.view
+
+import com.intellij.openapi.editor.Editor
+import com.intellij.ui.ColorUtil
+import com.intellij.ui.scale.JBUIScale
+import org.acejump.boundaries.EditorOffsetCache
+import org.acejump.boundaries.StandardBoundaries
+import org.acejump.config.AceConfig
+import org.acejump.countMatchingCharacters
+import org.acejump.immutableText
+import java.awt.Color
+import java.awt.Graphics2D
+import java.awt.Point
+import java.awt.Rectangle
+import kotlin.math.max
+
+/**
+ * Describes a 1 or 2 character shortcut that points to a specific character in the editor.
+ */
+internal class Tag(
+  private val tag: String,
+  val offsetL: Int,
+  val offsetR: Int,
+  private val shiftR: Int,
+  private val hasSpaceRight: Boolean
+) {
+  private val length = tag.length
+  
+  companion object {
+    /**
+     * Creates a new tag, precomputing some information about the nearby characters to reduce rendering overhead. If the last typed
+     * character ([literalQueryText]) matches the first [tag] character, only the second [tag] character is displayed.
+     */
+    fun create(editor: Editor, tag: String, offset: Int, literalQueryText: String?): Tag {
+      val chars = editor.immutableText
+      val matching = literalQueryText?.let { chars.countMatchingCharacters(offset, it) } ?: 0
+      val hasSpaceRight = offset + 1 >= chars.length || chars[offset + 1].isWhitespace()
+      
+      val displayedTag = if (literalQueryText != null && literalQueryText.last().equals(tag.first(), ignoreCase = true))
+        tag.drop(1).toUpperCase()
+      else
+        tag.toUpperCase()
+      
+      return Tag(displayedTag, offset, offset + max(0, matching - 1), tag.length - displayedTag.length, hasSpaceRight)
+    }
+    
+    /**
+     * Renders the tag background.
+     */
+    private fun drawHighlight(g: Graphics2D, rect: Rectangle, color: Color, arc: Int) {
+      g.color = color
+      g.fillRoundRect(rect.x, rect.y + 1, rect.width, rect.height - 1, arc, arc)
+    }
+    
+    /**
+     * Renders the tag text.
+     */
+    private fun drawForeground(g: Graphics2D, font: TagFont, point: Point, text: String) {
+      g.font = font.tagFont
+      g.color = AceConfig.tagForegroundColor
+      g.drawString(text, point.x, point.y + font.baselineDistance)
+    }
+  }
+  
+  /**
+   * Returns true if the left-aligned offset is in the range. Use to cull tags outside visible range.
+   * Only the left offset is checked, because if the tag was right-aligned on the last index of the range, it would not be visible anyway.
+   */
+  fun isOffsetInRange(range: IntRange): Boolean {
+    return offsetL in range
+  }
+  
+  /**
+   * Determines on which side of the target character the tag is positioned.
+   */
+  enum class TagAlignment {
+    LEFT,
+    RIGHT
+  }
+  
+  /**
+   * Paints the tag, taking into consideration visual space around characters in the editor, as well as all other previously painted tags.
+   * Returns a rectangle indicating the area where the tag was rendered, or null if the tag could not be rendered due to overlap.
+   */
+  fun paint(
+    g: Graphics2D, editor: Editor, cache: EditorOffsetCache, font: TagFont, occupied: MutableList<Rectangle>, isRegex: Boolean
+  ): Rectangle? {
+    val (rect, alignment) = alignTag(editor, cache, font, occupied) ?: return null
+    
+    val highlightColor = when {
+      alignment != TagAlignment.RIGHT || hasSpaceRight || isRegex -> AceConfig.tagBackgroundColor
+      else                                                        -> ColorUtil.darker(AceConfig.tagBackgroundColor, 3)
+    }
+    
+    drawHighlight(g, rect, highlightColor, font.tagCornerArc)
+    drawForeground(g, font, rect.location, tag)
+    
+    occupied.add(JBUIScale.scale(2).let { Rectangle(rect.x - it, rect.y, rect.width + (2 * it), rect.height) })
+    return rect
+  }
+  
+  private fun alignTag(editor: Editor, cache: EditorOffsetCache, font: TagFont, occupied: List<Rectangle>): Pair<Rectangle, TagAlignment>? {
+    val boundaries = StandardBoundaries.VISIBLE_ON_SCREEN
+    
+    if (hasSpaceRight || offsetL == 0 || editor.immutableText[offsetL - 1].let { it == '\n' || it == '\r' }) {
+      val rectR = createRightAlignedTagRect(editor, cache, font)
+      
+      return (rectR to TagAlignment.RIGHT).takeIf {
+        boundaries.isOffsetInside(editor, offsetR, cache) && occupied.none(rectR::intersects)
+      }
+    }
+    
+    val rectL = createLeftAlignedTagRect(editor, cache, font)
+    
+    if (occupied.none(rectL::intersects)) {
+      return (rectL to TagAlignment.LEFT).takeIf { boundaries.isOffsetInside(editor, offsetL, cache) }
+    }
+    
+    val rectR = createRightAlignedTagRect(editor, cache, font)
+    
+    if (occupied.none(rectR::intersects)) {
+      return (rectR to TagAlignment.RIGHT).takeIf { boundaries.isOffsetInside(editor, offsetR, cache) }
+    }
+    
+    return null
+  }
+  
+  private fun createRightAlignedTagRect(editor: Editor, cache: EditorOffsetCache, font: TagFont): Rectangle {
+    val pos = cache.offsetToXY(editor, offsetR)
+    val shift = font.editorFontMetrics.charWidth(editor.immutableText[offsetR]) + (font.tagCharWidth * shiftR)
+    return Rectangle(pos.x + shift, pos.y, font.tagCharWidth * length, font.lineHeight)
+  }
+  
+  private fun createLeftAlignedTagRect(editor: Editor, cache: EditorOffsetCache, font: TagFont): Rectangle {
+    val pos = cache.offsetToXY(editor, offsetL)
+    val shift = -(font.tagCharWidth * length)
+    return Rectangle(pos.x + shift, pos.y, font.tagCharWidth * length, font.lineHeight)
+  }
+}

src/main/kotlin/org/acejump/view/TagCanvas.kt

@@ -2,6 +2,8 @@ package org.acejump.view
 
 import com.intellij.openapi.application.ApplicationInfo
 import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.editor.event.CaretEvent
+import com.intellij.openapi.editor.event.CaretListener
 import com.intellij.ui.ColorUtil
 import org.acejump.boundaries.EditorOffsetCache
 import org.acejump.boundaries.StandardBoundaries
@@ -16,9 +18,9 @@ import javax.swing.SwingUtilities
 /**
  * Holds all active tag markers and renders them on top of the editor.
  */
-internal class TagCanvas(private val editor: Editor) : JComponent() {
-  private var markers: Collection<TagMarker> = emptyList()
-  private var visible = false
+internal class TagCanvas(private val editor: Editor) : JComponent(), CaretListener {
+  private var markers: List<Tag>? = null
+  private var isRegex = false
   
   init {
     val contentComponent = editor.contentComponent
@@ -28,51 +30,72 @@ internal class TagCanvas(private val editor: Editor) : JComponent() {
     if (ApplicationInfo.getInstance().build.components.first() < 173) {
       SwingUtilities.convertPoint(this, location, editor.component.rootPane).let { setLocation(-it.x, -it.y) }
     }
+    
+    editor.caretModel.addCaretListener(this)
   }
   
   fun unbind() {
+    markers = null
     editor.contentComponent.remove(this)
-    editor.contentComponent.repaint()
+    editor.caretModel.removeCaretListener(this)
   }
   
-  fun setMarkers(markers: Collection<TagMarker>) {
+  /**
+   * Ensures that all tags and the outline around the selected tag are repainted. It should not be necessary to repaint the entire tag
+   * canvas, but the cost of repainting visible tags is negligible.
+   */
+  override fun caretPositionChanged(event: CaretEvent) {
+    repaint()
+  }
+  
+  fun setMarkers(markers: List<Tag>, isRegex: Boolean) {
     this.markers = markers
-    this.visible = true
+    this.isRegex = isRegex
     repaint()
   }
   
   fun removeMarkers() {
     this.markers = emptyList()
-    this.visible = false
-    repaint()
+  }
+  
+  override fun paint(g: Graphics) {
+    if (!markers.isNullOrEmpty()) {
+      super.paint(g)
+    }
   }
   
   override fun paintChildren(g: Graphics) {
     super.paintChildren(g)
     
-    if (!visible) {
-      return
-    }
-    
-    g.color = ColorUtil.withAlpha(editor.colorsScheme.defaultBackground, (AceConfig.editorFadeOpacity * 0.01).coerceIn(0.0, 1.0))
-    g.fillRect(0, 0, width - 1, height - 1)
-    
-    if (markers.isEmpty()) {
-      return
-    }
-    
-    (g as Graphics2D).setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON)
-    
+    val markers = markers ?: return
     val font = TagFont(editor)
     
     val cache = EditorOffsetCache.new()
     val viewRange = StandardBoundaries.VISIBLE_ON_SCREEN.getOffsetRange(editor, cache)
     val occupied = mutableListOf<Rectangle>()
     
+    (g as Graphics2D).setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON)
+    
+    // If there is a tag at the caret location, prioritize its rendering over all other tags. This is helpful for seeing which tag is
+    // currently selected while navigating highly clustered tags, although it does end up rearranging nearby tags which can be confusing.
+    
+    // TODO instead of immediately painting, we could calculate the layout of everything first, and then remove tags that interfere with
+    //      the caret tag to avoid changing the alignment of the caret tag
+    
+    val caretOffset = editor.caretModel.offset
+    val caretMarker = markers.find { it.offsetL == caretOffset || it.offsetR == caretOffset }
+    val caretRect = caretMarker?.paint(g, editor, cache, font, occupied, isRegex)
+    
     for (marker in markers) {
-      if (marker.offset in viewRange) {
-        marker.paint(g, editor, cache, font, occupied)
+      if (marker.isOffsetInRange(viewRange) && marker !== caretMarker) {
+        marker.paint(g, editor, cache, font, occupied, isRegex)
       }
     }
+    
+    if (caretRect != null) {
+      g.color = ColorUtil.brighter(AceConfig.tagBackgroundColor, 10)
+      // Only adding 1 to width because it seems the right side of the tag highlight is slightly off.
+      g.drawRoundRect(caretRect.x - 1, caretRect.y, caretRect.width + 1, caretRect.height, font.tagCornerArc, font.tagCornerArc)
+    }
   }
 }

src/main/kotlin/org/acejump/view/TagFont.kt

@@ -1,20 +1,20 @@
-package org.acejump.view
+package org.acejump.view;
 
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.colors.EditorFontType
 import org.acejump.config.AceConfig
 import java.awt.Font
+import java.awt.FontMetrics
 
 /**
- * Stores font metrics for aligning and rendering [TagMarker]s.
+ * Stores font metrics for aligning and rendering [Tag]s.
  */
 internal class TagFont(editor: Editor) {
-  val tagFont: Font = editor.colorsScheme.getFont(EditorFontType.PLAIN)
-  val tagCharWidth = editor.component.getFontMetrics(tagFont).charWidth('W')
-  
-  val foregroundColor1 = AceConfig.tagForegroundColor1
-  val foregroundColor2 = AceConfig.tagForegroundColor2
+  val tagFont: Font = editor.colorsScheme.getFont(EditorFontType.BOLD)
+  val tagCharWidth = editor.component.getFontMetrics(tagFont).charWidth('w')
+  val tagCornerArc = if (AceConfig.roundedTagCorners) editor.colorsScheme.editorFontSize - 3 else 1
   
+  val editorFontMetrics: FontMetrics = editor.component.getFontMetrics(editor.colorsScheme.getFont(EditorFontType.PLAIN))
   val lineHeight = editor.lineHeight
   val baselineDistance = editor.ascent
 }

src/main/kotlin/org/acejump/view/TagMarker.kt

@@ -1,81 +0,0 @@
-package org.acejump.view
-
-import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.util.SystemInfo
-import org.acejump.boundaries.EditorOffsetCache
-import java.awt.Color
-import java.awt.Graphics2D
-import java.awt.Point
-import java.awt.Rectangle
-
-/**
- * Describes a 1 or 2 character shortcut that points to a specific character in the editor.
- */
-internal class TagMarker(
-  private val tag: CharArray,
-  val offset: Int
-) {
-  private val length = tag.size
-  
-  companion object {
-    /**
-     * TODO This might be due to DPI settings.
-     */
-    private val HIGHLIGHT_OFFSET = if (SystemInfo.isMac) -0.5 else 0.0
-    
-    /**
-     * Creates a new tag, precomputing some information about the nearby characters to reduce rendering overhead. If the last typed
-     * character ([typedTag]) matches the first [tag] character, only the second [tag] character is displayed.
-     */
-    fun create(tag: String, offset: Int, typedTag: String): TagMarker {
-      return TagMarker(tag.drop(typedTag.length).toCharArray(), offset)
-    }
-  }
-  
-  /**
-   * Paints the tag, taking into consideration visual space around characters in the editor, as well as all other previously painted tags.
-   * Returns a rectangle indicating the area where the tag was rendered, or null if the tag could not be rendered due to overlap.
-   */
-  fun paint(g: Graphics2D, editor: Editor, cache: EditorOffsetCache, font: TagFont, occupied: MutableList<Rectangle>): Rectangle? {
-    val rect = alignTag(editor, cache, font, occupied) ?: return null
-    
-    drawHighlight(g, rect, editor.colorsScheme.defaultBackground)
-    drawForeground(g, font, rect.location)
-    
-    occupied.add(rect)
-    return rect
-  }
-  
-  /**
-   * Renders the tag background.
-   */
-  private fun drawHighlight(g: Graphics2D, rect: Rectangle, color: Color) {
-    g.color = color
-    g.translate(0.0, HIGHLIGHT_OFFSET)
-    g.fillRect(rect.x, rect.y, rect.width, rect.height + 1)
-    g.translate(0.0, -HIGHLIGHT_OFFSET)
-  }
-  
-  /**
-   * Renders the tag text.
-   */
-  private fun drawForeground(g: Graphics2D, font: TagFont, point: Point) {
-    val x = point.x
-    val y = point.y + font.baselineDistance
-    
-    g.font = font.tagFont
-    g.color = font.foregroundColor1
-    g.drawChars(tag, 0, 1, x, y)
-    
-    if (tag.size > 1) {
-      g.color = font.foregroundColor2
-      g.drawChars(tag, 1, length - 1, x + font.tagCharWidth, y)
-    }
-  }
-  
-  private fun alignTag(editor: Editor, cache: EditorOffsetCache, font: TagFont, occupied: List<Rectangle>): Rectangle? {
-    val pos = cache.offsetToXY(editor, offset)
-    val rect = Rectangle(pos.x, pos.y, font.tagCharWidth * length, font.lineHeight)
-    return rect.takeIf { occupied.none(it::intersects) }
-  }
-}

src/main/kotlin/org/acejump/view/TextHighlighter.kt

@@ -6,7 +6,7 @@ import com.intellij.openapi.editor.markup.CustomHighlighterRenderer
 import com.intellij.openapi.editor.markup.HighlighterLayer
 import com.intellij.openapi.editor.markup.HighlighterTargetArea
 import com.intellij.openapi.editor.markup.RangeHighlighter
-import com.intellij.ui.ColorUtil
+import it.unimi.dsi.fastutil.ints.IntArrayList
 import it.unimi.dsi.fastutil.ints.IntList
 import org.acejump.boundaries.EditorOffsetCache
 import org.acejump.config.AceConfig
@@ -18,61 +18,61 @@ import java.awt.Graphics
 /**
  * Renders highlights for search occurrences.
  */
-internal class TextHighlighter {
-  private var previousHighlights = mutableMapOf<Editor, Array<RangeHighlighter>>()
+internal class TextHighlighter(private val editor: Editor) {
+  private var previousHighlights: Array<RangeHighlighter>? = null
   
   /**
    * Removes all current highlights and re-creates them from scratch. Must be called whenever any of the method parameters change.
    */
-  fun renderOccurrences(results: Map<Editor, IntList>, query: SearchQuery) {
-    render(results, when (query) {
+  fun renderOccurrences(offsets: IntList, query: SearchQuery) {
+    render(offsets, when (query) {
       is SearchQuery.RegularExpression -> RegexRenderer
       else                             -> SearchedWordRenderer
     }, query::getHighlightLength)
   }
   
-  private inline fun render(results: Map<Editor, IntList>, renderer: CustomHighlighterRenderer, getHighlightLength: (CharSequence, Int) -> Int) {
-    for ((editor, offsets) in results) {
-      val highlights = previousHighlights[editor]
+  /**
+   * Removes all current highlights and re-adds a single highlight at the position of the accepted tag with a different color.
+   */
+  fun renderFinal(offset: Int, query: SearchQuery) {
+    render(IntArrayList(intArrayOf(offset)), AcceptedTagRenderer, query::getHighlightLength)
+  }
+  
+  private inline fun render(offsets: IntList, renderer: CustomHighlighterRenderer, getHighlightLength: (CharSequence, Int) -> Int) {
+    val markup = editor.markupModel
+    val chars = editor.immutableText
+    
+    ARC = TagFont(editor).tagCornerArc
+    
+    val modifications = (previousHighlights?.size ?: 0) + offsets.size
+    val enableBulkEditing = modifications > 1000
+    
+    val document = editor.document
+    
+    try {
+      if (enableBulkEditing) {
+        document.isInBulkUpdate = true
+      }
       
-      val markup = editor.markupModel
-      val document = editor.document
-      val chars = editor.immutableText
-      
-      val modifications = (highlights?.size ?: 0) + offsets.size
-      val enableBulkEditing = modifications > 1000
-      
-      try {
-        if (enableBulkEditing) {
-          document.isInBulkUpdate = true
-        }
+      previousHighlights?.forEach(markup::removeHighlighter)
+      previousHighlights = Array(offsets.size) { index ->
+        val start = offsets.getInt(index)
+        val end = start + getHighlightLength(chars, start)
         
-        highlights?.forEach(markup::removeHighlighter)
-        previousHighlights[editor] = Array(offsets.size) { index ->
-          val start = offsets.getInt(index)
-          val end = start + getHighlightLength(chars, start)
-          
-          markup.addRangeHighlighter(start, end, LAYER, null, HighlighterTargetArea.EXACT_RANGE).apply {
-            customRenderer = renderer
-          }
-        }
-      } finally {
-        if (enableBulkEditing) {
-          document.isInBulkUpdate = false
+        markup.addRangeHighlighter(start, end, LAYER, null, HighlighterTargetArea.EXACT_RANGE).apply {
+          customRenderer = renderer
         }
       }
-    }
-    
-    for (editor in previousHighlights.keys.toList()) {
-      if (!results.containsKey(editor)) {
-        previousHighlights.remove(editor)?.forEach(editor.markupModel::removeHighlighter)
+    } finally {
+      if (enableBulkEditing) {
+        document.isInBulkUpdate = false
       }
     }
   }
   
   fun reset() {
-    previousHighlights.keys.forEach { it.markupModel.removeAllHighlighters() }
-    previousHighlights.clear()
+    editor.markupModel.removeAllHighlighters()
+    previousHighlights = null
   }
   
   /**
@@ -80,7 +80,7 @@ internal class TextHighlighter {
    */
   private object SearchedWordRenderer : CustomHighlighterRenderer {
     override fun paint(editor: Editor, highlighter: RangeHighlighter, g: Graphics) {
-      drawFilled(g, editor, highlighter.startOffset, highlighter.endOffset, AceConfig.searchHighlightColor)
+      drawFilled(g, editor, highlighter.startOffset, highlighter.endOffset, AceConfig.textHighlightColor)
     }
   }
   
@@ -89,22 +89,29 @@ internal class TextHighlighter {
    */
   private object RegexRenderer : CustomHighlighterRenderer {
     override fun paint(editor: Editor, highlighter: RangeHighlighter, g: Graphics) {
-      drawSingle(g, editor, highlighter.startOffset, AceConfig.searchHighlightColor)
+      drawSingle(g, editor, highlighter.startOffset, AceConfig.textHighlightColor)
+    }
+  }
+  
+  /**
+   * Renders a filled highlight in the background of the accepted tag position and search query.
+   */
+  private object AcceptedTagRenderer : CustomHighlighterRenderer {
+    override fun paint(editor: Editor, highlighter: RangeHighlighter, g: Graphics) {
+      drawFilled(g, editor, highlighter.startOffset, highlighter.endOffset, AceConfig.acceptedTagColor)
     }
   }
   
   private companion object {
     private const val LAYER = HighlighterLayer.LAST + 1
-    
+    private var ARC = 0
+  
     private fun drawFilled(g: Graphics, editor: Editor, startOffset: Int, endOffset: Int, color: Color) {
       val start = EditorOffsetCache.Uncached.offsetToXY(editor, startOffset)
       val end = EditorOffsetCache.Uncached.offsetToXY(editor, endOffset)
-      
-      g.color = ColorUtil.withAlpha(AceConfig.searchHighlightColor, 0.2)
-      g.fillRect(start.x, start.y + 1, end.x - start.x, editor.lineHeight - 1)
-      
+    
       g.color = color
-      g.drawRect(start.x, start.y, end.x - start.x, editor.lineHeight)
+      g.fillRoundRect(start.x, start.y + 1, end.x - start.x, editor.lineHeight - 1, ARC, ARC)
     }
     
     private fun drawSingle(g: Graphics, editor: Editor, offset: Int, color: Color) {
@@ -113,11 +120,8 @@ internal class TextHighlighter {
       val font = editor.colorsScheme.getFont(EditorFontType.PLAIN)
       val lastCharWidth = editor.component.getFontMetrics(font).charWidth(char)
       
-      g.color = ColorUtil.withAlpha(AceConfig.searchHighlightColor, 0.2)
-      g.fillRect(pos.x, pos.y + 1, lastCharWidth, editor.lineHeight - 1)
-      
       g.color = color
-      g.drawRect(pos.x, pos.y, lastCharWidth, editor.lineHeight)
+      g.fillRoundRect(pos.x, pos.y + 1, lastCharWidth, editor.lineHeight - 1, ARC, ARC)
     }
   }
 }

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

@@ -1,6 +1,6 @@
-<idea-plugin>
+<idea-plugin url="https://github.com/acejump/AceJump">
   <name>AceJump</name>
-  <id>AceJump-chylex</id>
+  <id>AceJump</id>
 
   <description><![CDATA[
     AceJump allows you to quickly navigate the caret to any position visible in the editor.
@@ -9,7 +9,6 @@
   </description>
 
   <depends>com.intellij.modules.platform</depends>
-  <depends>IdeaVIM</depends>
 
   <category>Navigation</category>
   <vendor url="https://github.com/acejump/AceJump">AceJump</vendor>
@@ -24,28 +23,50 @@
                          implementationClass="org.acejump.action.AceEditorAction$Reset"/>
     <editorActionHandler action="EditorBackSpace" order="first"
                          implementationClass="org.acejump.action.AceEditorAction$ClearSearch"/>
-    <editorActionHandler action="EditorEnter" order="first, before terminalEnter"
-                         implementationClass="org.acejump.action.AceEditorAction$TagImmediately"/>
+    <editorActionHandler action="EditorUp" order="first"
+                         implementationClass="org.acejump.action.AceEditorAction$SearchLineIndents"/>
+    <editorActionHandler action="EditorLeft" order="first"
+                         implementationClass="org.acejump.action.AceEditorAction$SearchLineStarts"/>
+    <editorActionHandler action="EditorLineStart" order="first"
+                         implementationClass="org.acejump.action.AceEditorAction$SearchLineStarts"/>
+    <editorActionHandler action="EditorRight" order="first"
+                         implementationClass="org.acejump.action.AceEditorAction$SearchLineEnds"/>
+    <editorActionHandler action="EditorLineEnd" order="first"
+                         implementationClass="org.acejump.action.AceEditorAction$SearchLineEnds"/>
   </extensions>
-  
+
   <actions>
-    <action id="AceVimAction_JumpAllEditors" class="org.acejump.action.AceVimAction$JumpAllEditors" text="AceJump Vim - Jump All Editors" />
-    <action id="AceVimAction_JumpAllEditors_GoToDeclaration" class="org.acejump.action.AceVimAction$JumpAllEditorsGoToDeclaration" text="AceJump Vim - Jump All Editors - Go To Declaration" />
-    <action id="AceVimAction_JumpForward" class="org.acejump.action.AceVimAction$JumpForward" text="AceJump Vim - Jump Forward" />
-    <action id="AceVimAction_JumpBackward" class="org.acejump.action.AceVimAction$JumpBackward" text="AceJump Vim - Jump Backward" />
-    <action id="AceVimAction_JumpTillForward" class="org.acejump.action.AceVimAction$JumpTillForward" text="AceJump Vim - Jump Till Forward" />
-    <action id="AceVimAction_JumpTillBackward" class="org.acejump.action.AceVimAction$JumpTillBackward" text="AceJump Vim - Jump Till Backward" />
-    <action id="AceVimAction_JumpOnLineForward" class="org.acejump.action.AceVimAction$JumpOnLineForward" text="AceJump Vim - Jump On Line Forward" />
-    <action id="AceVimAction_JumpOnLineBackward" class="org.acejump.action.AceVimAction$JumpOnLineBackward" text="AceJump Vim - Jump On Line Backward" />
-    <action id="AceVimAction_JumpLineIndentsForward" class="org.acejump.action.AceVimAction$JumpLineIndentsForward" text="AceJump Vim - Jump Line Indents Forward" />
-    <action id="AceVimAction_JumpLineIndentsBackward" class="org.acejump.action.AceVimAction$JumpLineIndentsBackward" text="AceJump Vim - Jump Line Indents Backward" />
-    <action id="AceVimAction_JumpLWordForward" class="org.acejump.action.AceVimAction$JumpLWordForward" text="AceJump Vim - Jump LWord Forward" />
-    <action id="AceVimAction_JumpUWordForward" class="org.acejump.action.AceVimAction$JumpUWordForward" text="AceJump Vim - Jump UWord Forward" />
-    <action id="AceVimAction_JumpLWordBackward" class="org.acejump.action.AceVimAction$JumpLWordBackward" text="AceJump Vim - Jump LWord Backward" />
-    <action id="AceVimAction_JumpUWordBackward" class="org.acejump.action.AceVimAction$JumpUWordBackward" text="AceJump Vim - Jump UWord Backward" />
-    <action id="AceVimAction_JumpLWordEndForward" class="org.acejump.action.AceVimAction$JumpLWordEndForward" text="AceJump Vim - Jump LWord End Forward" />
-    <action id="AceVimAction_JumpUWordEndForward" class="org.acejump.action.AceVimAction$JumpUWordEndForward" text="AceJump Vim - Jump UWord End Forward" />
-    <action id="AceVimAction_JumpLWordEndBackward" class="org.acejump.action.AceVimAction$JumpLWordEndBackward" text="AceJump Vim - Jump LWord End Backward" />
-    <action id="AceVimAction_JumpUWordEndBackward" class="org.acejump.action.AceVimAction$JumpUWordEndBackward" text="AceJump Vim - Jump UWord End Backward" />
+    <action id="AceAction"
+            class="org.acejump.action.AceKeyboardAction$ActivateAceJump"
+            text="Activate AceJump Mode">
+      <keyboard-shortcut keymap="Mac OS X" first-keystroke="ctrl SEMICOLON"/>
+      <keyboard-shortcut keymap="Mac OS X 10.5+" first-keystroke="ctrl SEMICOLON"/>
+      <keyboard-shortcut keymap="$default" first-keystroke="ctrl SEMICOLON"/>
+    </action>
+    <action id="AceLineAction"
+            class="org.acejump.action.AceKeyboardAction$StartAllLineMarksMode"
+            text="Start AceJump in All Line Marks Mode">
+      <keyboard-shortcut keymap="Mac OS X" first-keystroke="ctrl shift SEMICOLON"/>
+      <keyboard-shortcut keymap="Mac OS X 10.5+" first-keystroke="ctrl shift SEMICOLON"/>
+      <keyboard-shortcut keymap="$default" first-keystroke="ctrl shift SEMICOLON"/>
+    </action>
+    <action id="AceLineStartsAction"
+            class="org.acejump.action.AceKeyboardAction$StartAllLineStartsMode"
+            text="Start AceJump in All Line Starts Mode"/>
+    <action id="AceLineEndsAction"
+            class="org.acejump.action.AceKeyboardAction$StartAllLineEndsMode"
+            text="Start AceJump in All Line Ends Mode"/>
+    <action id="AceLineIndentsAction"
+            class="org.acejump.action.AceKeyboardAction$StartAllLineIndentsMode"
+            text="Start AceJump in All Line Indents Mode"/>
+    <action id="AceWordAction"
+            class="org.acejump.action.AceKeyboardAction$StartAllWordsMode"
+            text="Start AceJump in All Words Mode"/>
+    <action id="AceWordForwardAction"
+            class="org.acejump.action.AceKeyboardAction$StartAllWordsForwardMode"
+            text="Start AceJump in All Words After Caret Mode"/>
+    <action id="AceWordBackwardsAction"
+            class="org.acejump.action.AceKeyboardAction$StartAllWordsBackwardsMode"
+            text="Start AceJump in All Words Before Caret Mode"/>
   </actions>
 </idea-plugin>

src/test/kotlin/AceTest.kt

@@ -0,0 +1,118 @@
+import com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_ENTER
+import com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_START_NEW_LINE
+import org.acejump.action.AceKeyboardAction
+import org.acejump.test.util.BaseTest
+
+/**
+ * Functional test cases and end-to-end performance tests.
+ *
+ * TODO: Add more structure to test cases, use test resources to define files.
+ */
+
+class AceTest : BaseTest() {
+  fun `test that scanner finds all occurrences of single character`() =
+    assertEquals("test test test".search("t"), setOf(0, 3, 5, 8, 10, 13))
+
+  fun `test empty results for an absent query`() =
+    assertEmpty("test test test".search("best"))
+
+  fun `test sticky results on a query with extra characters`() =
+    assertEquals("test test test".search("testz"), setOf(0, 5, 10))
+
+  fun `test a query inside text with some variations`() =
+    assertEquals("abcd dabc cdab".search("cd"), setOf(2, 10))
+
+  fun `test a query containing a space character`() =
+    assertEquals("abcd dabc cdab".search("cd "), setOf(2))
+
+  fun `test a query containing a { character`() =
+    assertEquals("abcd{dabc cdab".search("cd{"), setOf(2))
+
+  fun `test that jumping to first occurrence succeeds`() {
+    "<caret>testing 1234".search("1")
+
+    takeAction(ACTION_EDITOR_ENTER)
+
+    myFixture.checkResult("testing <caret>1234")
+  }
+
+  fun `test that jumping to second occurrence succeeds`() {
+    "<caret>testing 1234".search("ti")
+
+    takeAction(ACTION_EDITOR_ENTER)
+
+    myFixture.checkResult("tes<caret>ting 1234")
+  }
+
+  fun `test that jumping to previous occurrence succeeds`() {
+    "te<caret>sting 1234".search("t")
+
+    takeAction(ACTION_EDITOR_START_NEW_LINE)
+
+    myFixture.checkResult("<caret>testing 1234")
+  }
+
+  fun `test tag selection`() {
+    "<caret>testing 1234".search("g")
+
+    typeAndWaitForResults(session.tags[0].key)
+    typeAndWaitForResults("j")
+
+    myFixture.checkResult("testin<caret>g 1234")
+  }
+
+  fun `test shift selection`() {
+    "<caret>testing 1234".search("4")
+
+    typeAndWaitForResults(session.tags[0].key)
+    typeAndWaitForResults("J")
+
+    myFixture.checkResult("<selection>testing 123<caret></selection>4")
+  }
+
+  fun `test words before caret action`() {
+    makeEditor("test words <caret> before caret is two")
+
+    takeAction(AceKeyboardAction.StartAllWordsBackwardsMode)
+
+    assertEquals(2, session.tags.size)
+  }
+
+  fun `test words after caret action`() {
+    makeEditor("test words <caret> after caret is four")
+
+    takeAction(AceKeyboardAction.StartAllWordsForwardMode)
+
+    assertEquals(4, session.tags.size)
+  }
+
+  fun `test word mode`() {
+    makeEditor("test word action")
+
+    takeAction(AceKeyboardAction.StartAllWordsMode)
+
+    assertEquals(3, session.tags.size)
+
+    typeAndWaitForResults(session.tags[1].key)
+    typeAndWaitForResults("j")
+
+    myFixture.checkResult("test <caret>word action")
+  }
+
+  fun `test target mode`() {
+    "<caret>test target action".search("target")
+
+    typeAndWaitForResults(session.tags[0].key)
+    typeAndWaitForResults("s")
+
+    myFixture.checkResult("test <selection>target<caret></selection> action")
+  }
+
+  fun `test line mode`() {
+    makeEditor("    test\n    three\n    lines\n")
+
+    takeAction(AceKeyboardAction.StartAllLineMarksMode)
+
+    assertEquals(9, session.tags.size)
+  }
+}

src/test/kotlin/LatencyTest.kt

@@ -1,10 +1,11 @@
-
-import org.acejump.action.AceVimAction
+import org.acejump.action.AceKeyboardAction
 import org.acejump.test.util.BaseTest
+import org.junit.Ignore
 import java.io.File
 import kotlin.random.Random
 import kotlin.system.measureTimeMillis
 
+@Ignore
 class LatencyTest : BaseTest() {
   
   private fun `test tag latency`(editorText: String) {
@@ -14,7 +15,7 @@ class LatencyTest : BaseTest() {
       
       for (query in chars) {
         makeEditor(editorText)
-        myFixture.testAction(AceVimAction.JumpAllEditors())
+        myFixture.testAction(AceKeyboardAction.ActivateAceJump)
         time += measureTimeMillis { typeAndWaitForResults("$query") }
         // TODO assert(Tagger.markers.isNotEmpty()) { "Should be tagged: $query" }
         resetEditor()

src/test/kotlin/org/acejump/test/util/BaseTest.kt

@@ -2,12 +2,11 @@ package org.acejump.test.util
 
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.IdeActions
-import com.intellij.openapi.editor.impl.EditorImpl
 import com.intellij.openapi.fileTypes.PlainTextFileType
 import com.intellij.psi.PsiFile
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
 import com.intellij.util.ui.UIUtil
-import org.acejump.action.AceVimAction
+import org.acejump.action.AceKeyboardAction
 import org.acejump.session.SessionManager
 
 abstract class BaseTest : BasePlatformTestCase() {
@@ -39,9 +38,7 @@ abstract class BaseTest : BasePlatformTestCase() {
   fun takeAction(action: AnAction) = myFixture.testAction(action)
   
   fun makeEditor(contents: String): PsiFile {
-    val file = myFixture.configureByText(PlainTextFileType.INSTANCE, contents)
-    (myFixture.editor as EditorImpl).scrollPane.viewport.setSize(1000, 100)
-    return file
+    return myFixture.configureByText(PlainTextFileType.INSTANCE, contents)
   }
   
   fun resetEditor() {
@@ -55,10 +52,10 @@ abstract class BaseTest : BasePlatformTestCase() {
     UIUtil.dispatchAllInvocationEvents()
   }
   
-  private fun String.executeQuery(query: String) {
+  fun String.executeQuery(query: String) {
     myFixture.run {
       makeEditor(this@executeQuery)
-      testAction(AceVimAction.JumpAllEditors())
+      testAction(AceKeyboardAction.ActivateAceJump)
       typeAndWaitForResults(query)
     }
   }