[WIP] Change plugin version

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

.gitignore

@@ -15,6 +15,7 @@ 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
+- Improvements to tag latency. Thanks to @chylex for [the PR](https://github.com/acejump/AceJump/pull/339)!
-- 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)!
 
 ### 3.6.3
 

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,26 +1,46 @@
+import org.jetbrains.changelog.closure
+import org.jetbrains.intellij.tasks.PatchPluginXmlTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-  idea
+  idea apply true
-  kotlin("jvm") version "1.5.10"
+  kotlin("jvm") version "1.3.72"
-  id("org.jetbrains.intellij") version "1.11.0"
+  id("org.jetbrains.intellij") version "0.6.5"
+  id("org.jetbrains.changelog") version "0.6.2"
+}
+
+tasks {
+  withType<KotlinCompile> {
+    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
+    kotlinOptions.freeCompilerArgs += "-progressive"
+  }
+  
+  withType<PatchPluginXmlTask> {
+    sinceBuild("201.6668.0")
+    changeNotes({ changelog.getLatest().toHTML() })
+  }
+}
+
+changelog {
+  path = "${project.projectDir}/CHANGES.md"
+  header = closure { "${project.version}" }
+}
+
+dependencies {
+  compileOnly(kotlin("stdlib-jdk8"))
 }
 
 repositories {
   mavenCentral()
+  jcenter()
 }
 
 intellij {
-  version.set("2022.3.1")
+  version = "2020.2"
-  updateSinceUntilBuild.set(false)
+  pluginName = "AceJump"
-  pluginsRepositories.custom("https://intellij.chylex.com")
+  updateSinceUntilBuild = false
-  plugins.add("IdeaVIM:chylex-15")
+  setPlugins("java")
-}
-
-tasks.withType<KotlinCompile> {
-  kotlinOptions.jvmTarget = "11"
-  kotlinOptions.freeCompilerArgs = listOf("-Xjvm-default=all")
 }
 
 group = "org.acejump"
-version = "chylex-11"
+version = "chylex"

gradle.properties

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MSYS* | MINGW* )
+  MINGW* )
     msys=true
     ;;
   NONSTOP* )
@@ -82,7 +82,6 @@ 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
@@ -130,7 +129,6 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,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%
@@ -64,14 +64,28 @@ 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

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

@@ -1,11 +1,7 @@
 package org.acejump
 
 import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.fileEditor.TextEditor
+import com.intellij.openapi.editor.actions.EditorActionUtil
-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
 
 annotation class ExternalUsage
 
@@ -15,21 +11,6 @@ annotation class ExternalUsage
 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
-        .selectedEditors
-        .mapNotNull { (it as? TextEditor)?.editor }
-    } catch (e: IncorrectOperationException) {
-      emptyList()
-    }
-  }
-
 /**
  * Returns true if [this] contains [otherText] at the specified offset.
  */
@@ -56,7 +37,7 @@ fun CharSequence.countMatchingCharacters(selfOffset: Int, otherText: String): In
  * Determines which characters form a "word" for the purposes of functions below.
  */
 val Char.isWordPart
-  get() = this in 'a'..'z' || this.isJavaIdentifierPart()
+  get() = this.isJavaIdentifierPart()
 
 /**
  * Finds index of the first character in a word.
@@ -76,9 +57,34 @@ inline fun CharSequence.wordStart(pos: Int, isPartOfWord: (Char) -> Boolean = Ch
  */
 inline fun CharSequence.wordEnd(pos: Int, isPartOfWord: (Char) -> Boolean = Char::isWordPart): Int {
   var end = pos
-  val limit = length - 1
   
-  while (end < limit && isPartOfWord(this[end + 1])) {
+  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
   }
   
@@ -90,25 +96,14 @@ inline fun CharSequence.wordEnd(pos: Int, isPartOfWord: (Char) -> Boolean = Char
  */
 inline fun CharSequence.wordEndPlus(pos: Int, isPartOfWord: (Char) -> Boolean = Char::isWordPart): Int {
   var end = this.wordEnd(pos, isPartOfWord)
-  val limit = length - 1
   
-  while (end < limit && !isPartOfWord(this[end + 1])) {
+  while (end < length - 1 && !isPartOfWord(this[end + 1])) {
     ++end
   }
   
-  if (end < limit && isPartOfWord(this[end + 1])) {
+  if (end < length - 1 && isPartOfWord(this[end + 1])) {
     ++end
   }
   
   return end
 }
-
-fun MutableMap<Editor, IntArrayList>.clone(): MutableMap<Editor, IntArrayList> {
-  val clone = HashMap<Editor, IntArrayList>(size)
-  
-  for ((editor, offsets) in this) {
-    clone[editor] = offsets.clone()
-  }
-  
-  return clone
-}

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)
   }
@@ -41,4 +43,16 @@ abstract class AceEditorAction(private val originalHandler: EditorActionHandler)
   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

@@ -4,7 +4,7 @@ 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.openEditors
+import org.acejump.boundaries.StandardBoundaries.*
 import org.acejump.search.Pattern
 import org.acejump.session.Session
 import org.acejump.session.SessionManager
@@ -12,23 +12,13 @@ import org.acejump.session.SessionManager
 /**
  * Base class for keyboard-activated actions that create or update an AceJump [Session].
  */
-abstract class AceKeyboardAction : DumbAwareAction() {
+sealed class AceKeyboardAction : DumbAwareAction() {
   final override fun update(action: AnActionEvent) {
     action.presentation.isEnabled = action.getData(EDITOR) != null
   }
   
   final override fun actionPerformed(e: AnActionEvent) {
-    val editor = e.getData(EDITOR) ?: return
+    invoke(SessionManager.start(e.getData(EDITOR) ?: return))
-    val project = e.project
-    if (project != null) {
-      val jumpEditors = project.openEditors
-        .sortedBy { if (it === editor) 0 else 1 }
-        .ifEmpty { listOf(editor) }
-      invoke(SessionManager.start(editor, jumpEditors))
-    }
-    else {
-      invoke(SessionManager.start(editor))
-    }
   }
   
   abstract operator fun invoke(session: Session)
@@ -37,16 +27,25 @@ abstract class AceKeyboardAction : DumbAwareAction() {
    * 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) {
+    override fun invoke(session: Session) = session.startRegexSearch(pattern, boundaries)
-      session.defaultBoundary = boundaries
-      session.startRegexSearch(pattern)
-    }
   }
   
   /**
-   * Starts or ends an AceJump session in quick jump mode.
+   * Starts or ends an AceJump session.
    */
   object ActivateAceJump : AceKeyboardAction() {
-    override fun invoke(session: Session) = session.startJumpMode()
+    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,42 +1,47 @@
 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.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.editor.actions.EditorActionUtil
-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.countMatchingCharacters
+import com.intellij.openapi.util.TextRange
-import org.acejump.immutableText
+import com.intellij.psi.PsiDocumentManager
-import org.acejump.isWordPart
+import com.intellij.psi.codeStyle.CodeStyleManager
+import com.intellij.refactoring.actions.RefactoringQuickListPopupAction
+import com.intellij.refactoring.actions.RenameElementAction
+import org.acejump.*
 import org.acejump.search.SearchProcessor
-import org.acejump.wordStart
+import kotlin.math.max
 
 /**
  * Base class for actions available after typing a tag.
  */
 sealed class AceTagAction {
-  abstract operator fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean, isFinal: Boolean)
+  abstract operator fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean)
   
   abstract class BaseJumpAction : AceTagAction() {
-    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean, isFinal: Boolean) {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
       val caretModel = editor.caretModel
       val oldCarets = if (shiftMode) caretModel.caretsAndSelections else emptyList()
       
       recordCaretPosition(editor)
-      
-      if (isFinal) {
-        ensureEditorFocused(editor)
-      }
-      
       moveCaretTo(editor, getCaretOffset(editor, searchProcessor, offset))
       
       if (shiftMode) {
@@ -59,6 +64,79 @@ sealed class AceTagAction {
     abstract fun getCaretOffset(editor: Editor, queryStartOffset: Int, queryEndOffset: Int, isInsideWord: Boolean): 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 BasePerCaretWriteAction(private val selector: AceTagAction) : AceTagAction() {
+    final override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
+      val oldCarets = editor.caretModel.caretsAndSelections
+      selector(editor, searchProcessor, offset, shiftMode = false)
+      val range = editor.selectionModel.let { TextRange(it.selectionStart, it.selectionEnd) }
+      
+      editor.caretModel.caretsAndSelections = oldCarets
+      invoke(editor, range, shiftMode)
+    }
+    
+    protected abstract operator fun invoke(editor: Editor, range: TextRange, shiftMode: Boolean)
+  
+    protected fun insertAtCarets(editor: Editor, text: String) {
+      val document = editor.document
+      
+      editor.caretModel.runForEachCaret {
+        if (it.hasSelection()) {
+          document.replaceString(it.selectionStart, it.selectionEnd, text)
+          fixIndents(editor, it.selectionStart, it.selectionEnd)
+        }
+        else {
+          document.insertString(it.offset, text)
+          fixIndents(editor, it.offset, it.offset + text.length)
+        }
+      }
+    }
+  
+    private fun fixIndents(editor: Editor, startOffset: Int, endOffset: Int) {
+      val project = editor.project ?: return
+      val document = editor.document
+      val documentManager = PsiDocumentManager.getInstance(project)
+      
+      documentManager.commitAllDocuments()
+      
+      val file = documentManager.getPsiFile(document) ?: return
+      val text = document.charsSequence
+      
+      if (startOffset > 0 && endOffset > startOffset + 1 && text[endOffset - 1] == '\n' && text[startOffset - 1] == '\n') {
+        CodeStyleManager.getInstance(project).adjustLineIndent(file, TextRange(startOffset, endOffset - 1))
+      }
+      else {
+        CodeStyleManager.getInstance(project).adjustLineIndent(file, TextRange(startOffset, endOffset))
+      }
+    }
+  }
+  
   private companion object {
     fun countMatchingCharacters(editor: Editor, searchProcessor: SearchProcessor, offset: Int): Int {
       return editor.immutableText.countMatchingCharacters(offset, searchProcessor.query.rawText)
@@ -74,22 +152,14 @@ sealed class AceTagAction {
       caretModel.moveToOffset(offset)
     }
     
-    fun performAction(actionName: String) {
+    fun selectRange(editor: Editor, fromOffset: Int, toOffset: Int, cursorOffset: Int = toOffset) = with(editor) {
-      val actionManager = ActionManager.getInstance()
+      selectionModel.removeSelection(true)
-      val action = actionManager.getAction(actionName)
+      selectionModel.setSelection(fromOffset, toOffset)
-      if (action != null) {
+      caretModel.moveToOffset(cursorOffset)
-        actionManager.tryToExecute(action, ActionCommand.getInputEvent(null), null, null, true)
-      }
     }
     
-    fun ensureEditorFocused(editor: Editor) {
+    fun performAction(action: AnAction) {
-      val project = editor.project ?: return
+      ActionManager.getInstance().tryToExecute(action, ActionCommand.getInputEvent(null), null, null, true)
-      val fem = FileEditorManagerEx.getInstanceEx(project)
-      
-      val window = fem.windows.firstOrNull { (it.selectedEditor?.selectedWithProvider?.fileEditor as? TextEditor)?.editor === editor }
-      if (window != null && window !== fem.currentWindow) {
-        fem.currentWindow = window
-      }
     }
     
     private fun addCurrentPositionToHistory(project: Project, document: Document) {
@@ -115,6 +185,26 @@ sealed class AceTagAction {
     }
   }
   
+  /**
+   * 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
@@ -131,15 +221,266 @@ sealed class AceTagAction {
     }
   }
   
+  /**
+   * 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 JumpToWordEnd : BaseWordAction() {
+    override fun getCaretOffset(editor: Editor, queryStartOffset: Int, queryEndOffset: Int, isInsideWord: Boolean): Int {
+      return if (isInsideWord)
+        editor.immutableText.wordEnd(queryEndOffset) + 1
+      else
+        queryEndOffset
+    }
+  }
+  
+  /**
+   * On default action, places the caret at the end of the line.
+   * On shift action, adds the new caret to existing carets.
+   */
+  object JumpToLineEnd : BaseWordAction() {
+    override fun getCaretOffset(editor: Editor, queryStartOffset: Int, queryEndOffset: Int, isInsideWord: Boolean): Int {
+      val document = editor.document
+      val line = document.getLineNumber(queryEndOffset)
+      return document.getLineEndOffset(line)
+    }
+  }
+  
+  /**
+   * On default action, selects all characters covered by the search query.
+   * On shift action, adds the new selection to existing selections.
+   */
+  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
+   * last 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 = JumpToWordStart.getCaretOffset(editor, offset, queryEndOffset, isInsideWord = true)
+        val endOffset = JumpToWordEnd.getCaretOffset(editor, offset, queryEndOffset, isInsideWord = true)
+        
+        selectRange(editor, startOffset, endOffset)
+      }
+      else {
+        SelectQuery(editor, searchProcessor, offset, shiftMode = false)
+      }
+    }
+  }
+  
+  /**
+   * On default action, places the caret at the end of a camel hump inside a word, and also selects the hump. If there is no word at the
+   * last character of the search query, then the search query is selected. See [SelectWord] and [SelectQuery] for details.
+   *
+   * On shift action, adds the new selection to existing selections.
+   */
+  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)
+      }
+    }
+  }
+  
+  /**
+   * On default action, selects a word according to [SelectWord], and then extends the selection in either or both directions based
+   * on the characters around the word. TODO
+   *
+   * On shift action, adds the new selection to existing selections.
+   */
+  object SelectAroundWord : BaseSelectAction() {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int) {
+      SelectWord(editor, searchProcessor, offset, shiftMode = false)
+      val text = editor.immutableText
+      var selectionStart = editor.selectionModel.selectionStart
+      var selectionEnd = editor.selectionModel.selectionEnd
+      val indentStart = EditorActionUtil.findFirstNonSpaceOffsetOnTheLine(editor.document, editor.caretModel.logicalPosition.line)
+      
+      while (selectionStart > 0 && selectionStart > indentStart && text[selectionStart - 1].let { it == ' ' || it == ',' }) {
+        --selectionStart
+      }
+      
+      while (selectionEnd < text.length && text[selectionEnd].let { it == ' ' || it == ',' }) {
+        ++selectionEnd
+      }
+      
+      if (selectionStart > 0 && text[selectionStart - 1] == '!') {
+        --selectionStart
+      }
+      
+      selectRange(editor, selectionStart, selectionEnd)
+    }
+  }
+  
+  /**
+   * On default action, selects the line at the tag, excluding the indent.
+   * On shift action, adds the new selection to existing selections.
+   */
+  object SelectLine : BaseSelectAction() {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int) {
+      JumpToSearchEnd(editor, searchProcessor, offset, shiftMode = false)
+      
+      val document = editor.document
+      val line = editor.caretModel.logicalPosition.line
+      val lineStart = EditorActionUtil.findFirstNonSpaceOffsetOnTheLine(document, line)
+      val lineEnd = document.getLineEndOffset(line)
+      
+      selectRange(editor, lineStart, lineEnd)
+    }
+  }
+  
+  /**
+   * On default action, places the caret at the last character of the search query, and then performs Extend Selection a set amount of
+   * times.
+   *
+   * On shift action, adds the new selection to existing selections.
+   */
+  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)
+      }
+    }
+  }
+  
+  /**
+   * On default action, selects the range between the caret and a position decided by the provided [BaseJumpAction].
+   * On shift action, adds the new selection to existing selections.
+   */
+  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)
+      }
+    }
+  }
+  
+  /**
+   * On default action, selects the range between [firstOffset] and a position decided by the provided [BaseJumpAction].
+   * On shift action, adds the new selection to existing selections.
+   */
+  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)
+    }
+  }
+  
+  /**
+   * On default action, selects text based on the provided [selector] action, and deletes it without moving the existing carets.
+   * On shift action, moves caret to the position where deletion occurred.
+   */
+  class Delete(private val selector: AceTagAction) : AceTagAction() {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
+      val oldCarets = editor.caretModel.caretsAndSelections
+      
+      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) }
+      }
+      
+      if (!shiftMode) {
+        editor.caretModel.caretsAndSelections = oldCarets
+      }
+    }
+  }
+  
+  /**
+   * Selects text based on the provided [selector] action and clones it at every existing caret, selecting the cloned text. If a caret
+   * has a selection, the selected text will be replaced.
+   */
+  class CloneToCaret(selector: AceTagAction) : BasePerCaretWriteAction(selector) {
+    override fun invoke(editor: Editor, range: TextRange, shiftMode: Boolean) {
+      WriteCommandAction.writeCommandAction(editor.project).withName("AceJump Clone").run<Throwable> {
+        insertAtCarets(editor, editor.document.getText(range))
+      }
+    }
+  }
+  
+  /**
+   * Selects text based on the provided [selector] action and clones it to every existing caret, selecting the cloned text and deleting
+   * the original. If a caret has a selection, the selected text will be replaced.
+   */
+  open class MoveToCaret(selector: AceTagAction) : BasePerCaretWriteAction(selector) {
+    override fun invoke(editor: Editor, range: TextRange, shiftMode: Boolean) {
+      val difference = if (shiftMode) editor.caretModel.caretsAndSelections.sumBy {
+        val start = it.selectionStart?.let(editor::logicalPositionToOffset)
+        val end = it.selectionEnd?.let(editor::logicalPositionToOffset)
+        if (start == null || end == null || end > range.endOffset) 0 else range.length - (end - start)
+      } else 0
+      
+      WriteCommandAction.writeCommandAction(editor.project).withName("AceJump Move").run<Throwable> {
+        val document = editor.document
+        val text = document.getText(range)
+        document.deleteString(range.startOffset, range.endOffset)
+        insertAtCarets(editor, text)
+      }
+      
+      if (shiftMode) {
+        editor.selectionModel.removeSelection(true)
+        editor.caretModel.moveToOffset(range.startOffset + difference)
+      }
+    }
+  }
+  
   /**
    * 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.
    */
   object GoToDeclaration : AceTagAction() {
-    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean, isFinal: Boolean) {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
-      JumpToWordStart(editor, searchProcessor, offset, shiftMode = false, isFinal = isFinal)
+      JumpToWordStart(editor, searchProcessor, offset, shiftMode = false)
-      ApplicationManager.getApplication().invokeLater { performAction(if (shiftMode) IdeActions.ACTION_GOTO_TYPE_DECLARATION else IdeActions.ACTION_GOTO_DECLARATION) }
+      performAction(if (shiftMode) GotoTypeDeclarationAction() else GotoDeclarationAction())
     }
   }
   
@@ -149,9 +490,9 @@ sealed class AceTagAction {
    * Always places the caret at the start of the word.
    */
   object ShowUsages : AceTagAction() {
-    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean, isFinal: Boolean) {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
-      JumpToWordStart(editor, searchProcessor, offset, shiftMode = false, isFinal = isFinal)
+      JumpToWordStart(editor, searchProcessor, offset, shiftMode = false)
-      ApplicationManager.getApplication().invokeLater { performAction(if (shiftMode) IdeActions.ACTION_FIND_USAGES else ShowUsagesAction.ID) }
+      performAction(if (shiftMode) FindUsagesAction() else ShowUsagesAction())
     }
   }
   
@@ -160,9 +501,9 @@ sealed class AceTagAction {
    * Always places the caret at the start of the word.
    */
   object ShowIntentions : AceTagAction() {
-    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean, isFinal: Boolean) {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
-      JumpToWordStart(editor, searchProcessor, offset, shiftMode = false, isFinal = isFinal)
+      JumpToWordStart(editor, searchProcessor, offset, shiftMode = false)
-      ApplicationManager.getApplication().invokeLater { performAction(IdeActions.ACTION_SHOW_INTENTION_ACTIONS) }
+      performAction(ShowIntentionActionsAction())
     }
   }
   
@@ -172,9 +513,14 @@ sealed class AceTagAction {
    * Always places the caret at the start of the word.
    */
   object Refactor : AceTagAction() {
-    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean, isFinal: Boolean) {
+    override fun invoke(editor: Editor, searchProcessor: SearchProcessor, offset: Int, shiftMode: Boolean) {
-      JumpToWordStart(editor, searchProcessor, offset, shiftMode = false, isFinal = isFinal)
+      JumpToWordStart(editor, searchProcessor, offset, shiftMode = false)
-      ApplicationManager.getApplication().invokeLater { performAction(if (shiftMode) IdeActions.ACTION_RENAME else "Refactorings.QuickListPopupAction") }
+      if (shiftMode) {
+        ApplicationManager.getApplication().invokeLater { performAction(RenameElementAction()) }
+      }
+      else {
+        performAction(RefactoringQuickListPopupAction())
+      }
     }
   }
 }

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

@@ -1,66 +0,0 @@
-package org.acejump.action
-
-import org.acejump.boundaries.Boundaries
-import org.acejump.boundaries.StandardBoundaries.VISIBLE_ON_SCREEN
-import org.acejump.modes.ActionMode
-import org.acejump.session.Session
-
-sealed class AceVimAction : AceKeyboardAction() {
-  protected abstract val boundary: Boundaries
-  
-  final override fun invoke(session: Session) {
-    session.defaultBoundary = boundary
-    start(session)
-  }
-  
-  protected abstract fun start(session: Session)
-  
-  class GoToDeclaration : AceVimAction() {
-    override val boundary = VISIBLE_ON_SCREEN
-    override fun start(session: Session) {
-      session.startJumpMode { ActionMode(AceTagAction.GoToDeclaration, shiftMode = false) }
-    }
-  }
-  
-  class GoToTypeDeclaration : AceVimAction() {
-    override val boundary = VISIBLE_ON_SCREEN
-    override fun start(session: Session) {
-      session.startJumpMode { ActionMode(AceTagAction.GoToDeclaration, shiftMode = true) }
-    }
-  }
-  
-  class ShowIntentions : AceVimAction() {
-    override val boundary = VISIBLE_ON_SCREEN
-    override fun start(session: Session) {
-      session.startJumpMode { ActionMode(AceTagAction.ShowIntentions, shiftMode = false) }
-    }
-  }
-  
-  class ShowUsages : AceVimAction() {
-    override val boundary = VISIBLE_ON_SCREEN
-    override fun start(session: Session) {
-      session.startJumpMode { ActionMode(AceTagAction.ShowUsages, shiftMode = false) }
-    }
-  }
-  
-  class FindUsages : AceVimAction() {
-    override val boundary = VISIBLE_ON_SCREEN
-    override fun start(session: Session) {
-      session.startJumpMode { ActionMode(AceTagAction.ShowUsages, shiftMode = true) }
-    }
-  }
-  
-  class Refactor : AceVimAction() {
-    override val boundary = VISIBLE_ON_SCREEN
-    override fun start(session: Session) {
-      session.startJumpMode { ActionMode(AceTagAction.Refactor, shiftMode = false) }
-    }
-  }
-  
-  class Rename : AceVimAction() {
-    override val boundary = VISIBLE_ON_SCREEN
-    override fun start(session: Session) {
-      session.startJumpMode { ActionMode(AceTagAction.Refactor, shiftMode = true) }
-    }
-  }
-}

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

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

@@ -21,6 +21,8 @@ class AceConfig : PersistentStateComponent<AceSettings> {
     val layout get() = settings.layout
     val minQueryLength get() = settings.minQueryLength
     val jumpModeColor get() = settings.jumpModeColor
+    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

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

@@ -16,6 +16,8 @@ class AceConfigurable : Configurable {
       panel.keyboardLayout != settings.layout ||
       panel.minQueryLengthInt != settings.minQueryLength ||
       panel.jumpModeColor != settings.jumpModeColor ||
+      panel.fromCaretModeColor != settings.fromCaretModeColor ||
+      panel.betweenPointsModeColor != settings.betweenPointsModeColor ||
       panel.textHighlightColor != settings.textHighlightColor ||
       panel.tagForegroundColor != settings.tagForegroundColor ||
       panel.tagBackgroundColor != settings.tagBackgroundColor ||
@@ -26,6 +28,8 @@ class AceConfigurable : Configurable {
     settings.layout = panel.keyboardLayout
     settings.minQueryLength = panel.minQueryLengthInt ?: settings.minQueryLength
     panel.jumpModeColor?.let { settings.jumpModeColor = 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 }

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

@@ -13,6 +13,12 @@ data class AceSettings(
   @OptionTag("jumpModeRGB", converter = ColorConverter::class)
   var jumpModeColor: Color = Color(0xFFFFFF),
   
+  @OptionTag("fromCaretModeRGB", converter = ColorConverter::class)
+  var fromCaretModeColor: Color = Color(0xFFB700),
+  
+  @OptionTag("betweenPointsModeRGB", converter = ColorConverter::class)
+  var betweenPointsModeColor: Color = Color(0x6FC5FF),
+  
   @OptionTag("textHighlightRGB", converter = ColorConverter::class)
   var textHighlightColor: Color = Color(0x394B58),
   

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

@@ -27,6 +27,8 @@ internal class AceSettingsPanel {
   private val keyboardLayoutArea = JBTextArea().apply { isEditable = false }
   private val minQueryLengthField = JBTextField()
   private val jumpModeColorWheel = ColorPanel()
+  private val fromCaretModeColorWheel = ColorPanel()
+  private val betweenPointsModeColorWheel = ColorPanel()
   private val textHighlightColorWheel = ColorPanel()
   private val tagForegroundColorWheel = ColorPanel()
   private val tagBackgroundColorWheel = ColorPanel()
@@ -53,7 +55,9 @@ internal class AceSettingsPanel {
     }
     
     titledRow("Colors") {
-      row("Caret background:") { short(jumpModeColorWheel) }
+      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) }
@@ -67,6 +71,8 @@ internal class AceSettingsPanel {
   internal var keyChars by keyboardLayoutArea
   internal var minQueryLength by minQueryLengthField
   internal var jumpModeColor by jumpModeColorWheel
+  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
@@ -81,6 +87,8 @@ internal class AceSettingsPanel {
     keyboardLayout = settings.layout
     minQueryLength = settings.minQueryLength.toString()
     jumpModeColor = settings.jumpModeColor
+    fromCaretModeColor = settings.fromCaretModeColor
+    betweenPointsModeColor = settings.betweenPointsModeColor
     textHighlightColor = settings.textHighlightColor
     tagForegroundColor = settings.tagForegroundColor
     tagBackgroundColor = settings.tagBackgroundColor

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

@@ -1,10 +1,5 @@
 package org.acejump.input
 
-import it.unimi.dsi.fastutil.objects.Object2IntMap
-import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap
-import java.awt.geom.Point2D
-import kotlin.math.floor
-
 /**
  * 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.
@@ -23,38 +18,7 @@ enum class KeyLayout(internal val rows: Array<String>, priority: String) {
   internal val allChars = rows.joinToString("").toCharArray().apply(CharArray::sort).joinToString("")
   internal val allPriorities = priority.mapIndexed { index, char -> char to index }.toMap()
   
-  private val keyDistances: Map<Char, Object2IntMap<Char>> by lazy {
-    val keyDistanceMap = mutableMapOf<Char, Object2IntMap<Char>>()
-    val keyLocations = mutableMapOf<Char, Point2D>()
-    
-    for ((rowIndex, rowChars) in rows.withIndex()) {
-      val keyY = rowIndex * 1.2F // Slightly increase cost of traveling between rows.
-      
-      for ((columnIndex, char) in rowChars.withIndex()) {
-        val keyX = columnIndex + (0.25F * rowIndex) // Assume a 1/4-key uniform stagger.
-        keyLocations[char] = Point2D.Float(keyX, keyY)
-      }
-    }
-    
-    for (fromChar in allChars) {
-      val distances = Object2IntOpenHashMap<Char>()
-      val fromLocation = keyLocations.getValue(fromChar)
-      
-      for (toChar in allChars) {
-        distances[toChar] = floor(2F * fromLocation.distanceSq(keyLocations.getValue(toChar))).toInt()
-      }
-      
-      keyDistanceMap[fromChar] = distances
-    }
-    
-    keyDistanceMap
-  }
-  
   internal inline fun priority(crossinline tagToChar: (String) -> Char): (String) -> Int? {
     return { allPriorities[tagToChar(it)] }
   }
-  
-  internal fun distanceBetweenKeys(char1: Char, char2: Char): Int {
-    return keyDistances.getValue(char1).getValue(char2)
-  }
 }

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

@@ -7,6 +7,48 @@ import org.acejump.config.AceSettings
  * with repeated keys (ex. FF, JJ) or adjacent keys (ex. GH, UJ).
  */
 internal object KeyLayoutCache {
+  /**
+   * 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.
@@ -35,7 +77,7 @@ internal object KeyLayoutCache {
   fun reset(settings: AceSettings) {
     tagOrder = compareBy(
       { it[0].isDigit() || it[1].isDigit() },
-      { settings.layout.distanceBetweenKeys(it[0], it[1]) },
+      { qwertyCharacterDistances.getValue(it[0]).getValue(it[1]) },
       settings.layout.priority { it[0] }
     )
     

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

@@ -1,12 +0,0 @@
-package org.acejump.modes
-
-import org.acejump.action.AceTagAction
-import org.acejump.search.Tag
-import org.acejump.session.SessionState
-
-class ActionMode(private val action: AceTagAction, private val shiftMode: Boolean) : JumpMode() {
-  override fun accept(state: SessionState, acceptedTag: Tag): Boolean {
-    state.act(action, acceptedTag, shiftMode, isFinal = true)
-    return true
-  }
-}

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

@@ -0,0 +1,91 @@
+package org.acejump.modes
+
+import com.intellij.openapi.editor.CaretState
+import org.acejump.action.AceTagAction
+import org.acejump.config.AceConfig
+import org.acejump.session.SessionState
+import org.acejump.session.TypeResult
+
+class BetweenPointsMode : SessionMode {
+  private companion object {
+    private val TYPE_TAG_HINT = arrayOf(
+      "<b>Type to Search...</b>"
+    )
+  
+    private val ACTION_MODE_HINT = arrayOf(
+      "<f>[S]</f>elect... / <f>[F]</f>rom Caret...",
+      "<f>[D]</f>elete...",
+      "<f>[C]</f>lone to Caret...",
+      "<f>[M]</f>ove to Caret..."
+    )
+    
+    private const val ACTION_MODE_FROM_CARET = 'F'
+    
+    private val ACTION_MODE_MAP = mapOf(
+      'S' to ({ action: AceTagAction.BaseSelectAction -> action }),
+      'D' to (AceTagAction::Delete),
+      'C' to (AceTagAction::CloneToCaret),
+      'M' to (AceTagAction::MoveToCaret)
+    )
+  }
+  
+  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) {
+      if (charTyped.equals(ACTION_MODE_FROM_CARET, ignoreCase = true)) {
+        return TypeResult.ChangeMode(SelectFromCaretMode())
+      }
+      
+      this.actionMode = ACTION_MODE_MAP[charTyped.toUpperCase()]
+      return TypeResult.Nothing
+    }
+    
+    if (acceptedTag == null) {
+      return state.type(charTyped)
+    }
+    
+    if (firstOffset == null) {
+      val selectAction = JumpMode.SELECT_ACTION_MAP[charTyped.toUpperCase()]
+      if (selectAction != null) {
+        state.act(actionMode(selectAction), acceptedTag, shiftMode = charTyped.isUpperCase())
+        return TypeResult.EndSession
+      }
+    }
+    
+    val jumpAction = JumpMode.JUMP_ACTION_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?, hasQuery: Boolean): Array<String>? {
+    return when {
+      actionMode == null  -> ACTION_MODE_HINT
+      acceptedTag == null -> TYPE_TAG_HINT.takeUnless { hasQuery }
+      firstOffset == null -> JumpMode.JUMP_ALT_HINT + JumpMode.SELECT_HINT
+      else                -> JumpMode.JUMP_ALT_HINT
+    }
+  }
+}

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

@@ -2,24 +2,74 @@ package org.acejump.modes
 
 import org.acejump.action.AceTagAction
 import org.acejump.config.AceConfig
-import org.acejump.search.Tag
 import org.acejump.session.SessionState
 import org.acejump.session.TypeResult
 
-open class JumpMode : SessionMode {
+class JumpMode : SessionMode {
+  companion object {
+    private val JUMP_HINT = arrayOf(
+      "<f>[J]</f>ump / <f>[L]</f> past Query",
+      "<f>[E]</f> Word End / <f>[M]</f> Line End"
+    )
+    
+    val JUMP_ALT_HINT = JUMP_HINT.map { it.replace("<f>[J]</f>ump ", "<f>[J]</f> at Tag ") }.toTypedArray()
+    
+    val JUMP_ACTION_MAP = mapOf(
+      'J' to AceTagAction.JumpToSearchStart,
+      'L' to AceTagAction.JumpPastSearchEnd,
+      'E' to AceTagAction.JumpToWordEnd,
+      'M' to AceTagAction.JumpToLineEnd
+    )
+    
+    val SELECT_HINT = arrayOf(
+      "Select <f>[W]</f>ord / <f>[H]</f>ump / <f>[A]</f>round",
+      "Select <f>[Q]</f>uery / <f>[N]</f> Line / <f>[1-9]</f> Expansion"
+    )
+    
+    val SELECT_ACTION_MAP = mapOf(
+      'W' to AceTagAction.SelectWord,
+      'H' to AceTagAction.SelectHump,
+      'A' to AceTagAction.SelectAroundWord,
+      'Q' to AceTagAction.SelectQuery,
+      'N' to AceTagAction.SelectLine,
+      *('1'..'9').mapIndexed { index, char -> char to AceTagAction.SelectExtended(index + 1) }.toTypedArray()
+    )
+    
+    private val ALL_HINTS = arrayOf(
+      *JUMP_HINT,
+      *SELECT_HINT,
+      "<f>[D]</f>eclaration / <f>[U]</f>sages",
+      "<f>[I]</f>ntentions / <f>[R]</f>efactor"
+    )
+    
+    private val ALL_ACTION_MAP = mapOf(
+      *JUMP_ACTION_MAP.map { it.key to it.value }.toTypedArray(),
+      *SELECT_ACTION_MAP.map { it.key to it.value }.toTypedArray(),
+      'D' to AceTagAction.GoToDeclaration,
+      'U' to AceTagAction.ShowUsages,
+      'I' to AceTagAction.ShowIntentions,
+      'R' to AceTagAction.Refactor
+    )
+  }
+  
   override val caretColor
     get() = AceConfig.jumpModeColor
   
-  protected var wasUpperCase = false
+  override fun type(state: SessionState, charTyped: Char, acceptedTag: Int?): TypeResult {
-    private set
+    if (acceptedTag == null) {
+      return state.type(charTyped)
+    }
   
-  override fun type(state: SessionState, charTyped: Char, acceptedTag: Tag?): TypeResult {
+    val action = ALL_ACTION_MAP[charTyped.toUpperCase()]
-    wasUpperCase = charTyped.isUpperCase()
+    if (action != null) {
-    return state.type(charTyped)
+      state.act(action, acceptedTag, charTyped.isUpperCase())
+      return TypeResult.EndSession
+    }
+  
+    return TypeResult.Nothing
   }
   
-  override fun accept(state: SessionState, acceptedTag: Tag): Boolean {
+  override fun getHint(acceptedTag: Int?, hasQuery: Boolean): Array<String>? {
-    state.act(AceTagAction.JumpToSearchStart, acceptedTag, wasUpperCase, isFinal = true)
+    return ALL_HINTS.takeIf { acceptedTag != null }
-    return true
   }
 }

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

@@ -0,0 +1,29 @@
+package org.acejump.modes
+
+import org.acejump.action.AceTagAction
+import org.acejump.config.AceConfig
+import org.acejump.session.SessionState
+import org.acejump.session.TypeResult
+
+class SelectFromCaretMode : SessionMode {
+  override val caretColor
+    get() = AceConfig.fromCaretModeColor
+  
+  override fun type(state: SessionState, charTyped: Char, acceptedTag: Int?): TypeResult {
+    if (acceptedTag == null) {
+      return state.type(charTyped)
+    }
+    
+    val jumpAction = JumpMode.JUMP_ACTION_MAP[charTyped.toUpperCase()]
+    if (jumpAction == null) {
+      return TypeResult.Nothing
+    }
+    
+    state.act(AceTagAction.SelectToCaret(jumpAction), acceptedTag, shiftMode = charTyped.isUpperCase())
+    return TypeResult.EndSession
+  }
+  
+  override fun getHint(acceptedTag: Int?, hasQuery: Boolean): Array<String>? {
+    return JumpMode.JUMP_ALT_HINT.takeIf { acceptedTag != null }
+  }
+}

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

@@ -1,6 +1,5 @@
 package org.acejump.modes
 
-import org.acejump.search.Tag
 import org.acejump.session.SessionState
 import org.acejump.session.TypeResult
 import java.awt.Color
@@ -8,6 +7,6 @@ import java.awt.Color
 interface SessionMode {
   val caretColor: Color
   
-  fun type(state: SessionState, charTyped: Char, acceptedTag: Tag?): TypeResult
+  fun type(state: SessionState, charTyped: Char, acceptedTag: Int?): TypeResult
-  fun accept(state: SessionState, acceptedTag: Tag): Boolean
+  fun getHint(acceptedTag: Int?, hasQuery: Boolean): Array<String>?
 }

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_]"),
+  LINE_ALL_MARKS(LINE_ENDS.regex + "|" + LINE_STARTS.regex + "|" + LINE_INDENTS.regex),
-  VIM_LWORD("(?<=[^a-zA-Z0-9_]|\\A)[a-zA-Z0-9_]"),
+  ALL_WORDS("(?<=[^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)")
 }

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

@@ -10,42 +10,36 @@ import org.acejump.matchesAt
 /**
  * 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, results: MutableMap<Editor, IntArrayList>) {
+class SearchProcessor private constructor(private val editor: Editor, query: SearchQuery) {
   companion object {
-    fun fromChar(editors: List<Editor>, char: Char, boundaries: Boundaries): SearchProcessor {
+    fun fromChar(editor: Editor, char: Char, boundaries: Boundaries): SearchProcessor {
-      return SearchProcessor(editors, SearchQuery.Literal(char.toString()), boundaries)
+      return SearchProcessor(editor, SearchQuery.Literal(char.toString()), boundaries)
     }
     
-    fun fromRegex(editors: List<Editor>, pattern: String, boundaries: Boundaries): SearchProcessor {
+    fun fromRegex(editor: Editor, pattern: String, boundaries: Boundaries): SearchProcessor {
-      return SearchProcessor(editors, SearchQuery.RegularExpression(pattern), boundaries)
+      return SearchProcessor(editor, SearchQuery.RegularExpression(pattern), boundaries)
     }
   }
   
-  private constructor(editors: List<Editor>, query: SearchQuery, boundaries: Boundaries) : this(query, mutableMapOf()) {
+  private constructor(editor: Editor, query: SearchQuery, boundaries: Boundaries) : this(editor, query) {
     val regex = query.toRegex()
     
     if (regex != null) {
-      for (editor in editors) {
+      val offsetRange = boundaries.getOffsetRange(editor)
-        val offsets = IntArrayList()
+      var result = regex.find(editor.immutableText, offsetRange.first)
       
-        val offsetRange = boundaries.getOffsetRange(editor)
+      while (result != null) {
-        var result = regex.find(editor.immutableText, offsetRange.first)
+        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)
         
-        while (result != null) {
+        if (highlightEnd > offsetRange.last) {
-          val index = result.range.first // For some reason regex matches can be out of bounds, but boundary check prevents an exception.
+          break
-          val highlightEnd = index + query.getHighlightLength("", index)
+        }
-          
+        else if (boundaries.isOffsetInside(editor, index)) {
-          if (highlightEnd > offsetRange.last) {
+          results.add(index)
-            break
-          }
-          else if (boundaries.isOffsetInside(editor, index)) {
-            offsets.add(index)
-          }
-          
-          result = result.next()
         }
         
-        results[editor] = offsets
+        result = result.next()
       }
     }
   }
@@ -53,7 +47,7 @@ class SearchProcessor private constructor(query: SearchQuery, results: MutableMa
   internal var query = query
     private set
   
-  internal var results = results
+  internal var results = IntArrayList(0)
     private set
   
   /**
@@ -63,12 +57,13 @@ class SearchProcessor private constructor(query: SearchQuery, results: MutableMa
    */
   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 && !isContinuation(newQuery)) {
+    if (newQuery.length > 1 && !canMatchTag && results.none { chars.matchesAt(it, newQuery, ignoreCase = true) }) {
       return false
     }
     
@@ -81,19 +76,15 @@ class SearchProcessor private constructor(query: SearchQuery, results: MutableMa
       query = SearchQuery.Literal(char.toString())
       tagger.unmark()
       
-      for ((editor, offsets) in results) {
+      val iter = results.iterator()
-        val chars = editor.immutableText
+      while (iter.hasNext()) {
-        val iter = offsets.iterator()
+        val movedOffset = iter.nextInt() + newQuery.length - 1
         
-        while (iter.hasNext()) {
+        if (movedOffset < chars.length && chars[movedOffset].equals(char, ignoreCase = true)) {
-          val movedOffset = iter.nextInt() + newQuery.length - 1
+          iter.set(movedOffset)
-          
+        }
-          if (movedOffset < chars.length && chars[movedOffset].equals(char, ignoreCase = true)) {
+        else {
-            iter.set(movedOffset)
+          iter.remove()
-          }
-          else {
-            iter.remove()
-          }
         }
       }
     }
@@ -105,20 +96,6 @@ class SearchProcessor private constructor(query: SearchQuery, results: MutableMa
     return true
   }
   
-  /**
-   * Returns true if the new query is a continuation of any remaining search query.
-   */
-  private fun isContinuation(newQuery: String): Boolean {
-    for ((editor, offsets) in results) {
-      val chars = editor.immutableText
-      if (offsets.any { chars.matchesAt(it, newQuery, ignoreCase = true) }) {
-        return true
-      }
-    }
-    
-    return false
-  }
-  
   /**
    * After updating the query, removes all results that no longer match the search query.
    */
@@ -126,24 +103,25 @@ class SearchProcessor private constructor(query: SearchQuery, results: MutableMa
     val lastCharOffset = newQuery.lastIndex
     val lastChar = newQuery[lastCharOffset]
     val ignoreCase = newQuery[0].isLowerCase()
+    val chars = editor.immutableText
     
-    for ((editor, offsets) in results.entries.toList()) {
+    val remaining = IntArrayList()
-      val chars = editor.immutableText
+    val iter = results.iterator()
     
-      val remaining = IntArrayList()
+    while (iter.hasNext()) {
-      val iter = offsets.iterator()
+      val offset = iter.nextInt()
+      val endOffset = offset + lastCharOffset
+      val lastTypedCharMatches = endOffset < chars.length && chars[endOffset].equals(lastChar, ignoreCase)
       
-      while (iter.hasNext()) {
+      if (lastTypedCharMatches || tagger.isQueryCompatibleWithTagAt(newQuery, offset)) {
-        val offset = iter.nextInt()
+        remaining.add(offset)
-        val endOffset = offset + lastCharOffset
-        val lastTypedCharMatches = endOffset < chars.length && chars[endOffset].equals(lastChar, ignoreCase)
-        
-        if (lastTypedCharMatches || tagger.isQueryCompatibleWithTagAt(newQuery, Tag(editor, offset))) {
-          remaining.add(offset)
-        }
       }
-      
-      results[editor] = remaining
     }
+    
+    results = remaining
+  }
+  
+  fun clone(): SearchProcessor {
+    return SearchProcessor(editor, query).also { it.results.addAll(results) }
   }
 }

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

@@ -1,8 +1,8 @@
 package org.acejump.search
 
 import com.intellij.openapi.editor.Editor
-import it.unimi.dsi.fastutil.ints.IntList
+import it.unimi.dsi.fastutil.ints.*
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap
 import org.acejump.boundaries.EditorOffsetCache
 import org.acejump.boundaries.StandardBoundaries
 import org.acejump.config.AceConfig
@@ -10,7 +10,9 @@ import org.acejump.immutableText
 import org.acejump.input.KeyLayoutCache
 import org.acejump.isWordPart
 import org.acejump.wordEndPlus
-import java.util.IdentityHashMap
+import java.util.*
+import kotlin.collections.HashMap
+import kotlin.collections.HashSet
 import kotlin.math.max
 
 /*
@@ -51,83 +53,50 @@ import kotlin.math.max
  */
 
 internal class Solver private constructor(
-  private val editorPriority: List<Editor>,
+  private val editor: Editor,
   private val queryLength: Int,
-  private val newResults: Map<Editor, IntList>,
+  private val newResults: IntList,
-  private val allResults: Map<Editor, IntList>,
+  private val allResults: IntList
 ) {
   companion object {
     fun solve(
-      editorPriority: List<Editor>,
+      editor: Editor, query: SearchQuery, newResults: IntList, allResults: IntList, tags: List<String>, cache: EditorOffsetCache
-      query: SearchQuery,
+    ): Map<String, Int> {
-      newResults: Map<Editor, IntList>,
+      return Solver(editor, max(1, query.rawText.length), newResults, allResults).map(tags, cache)
-      allResults: Map<Editor, IntList>,
-      tags: List<String>,
-      caches: Map<Editor, EditorOffsetCache>,
-    ): Map<String, Tag> {
-      return Solver(editorPriority, max(1, query.rawText.length), newResults, allResults).map(tags, caches)
     }
   }
   
-  private var newTags = HashMap<String, Tag>(KeyLayoutCache.allPossibleTags.size)
+  private var newTags = Object2IntOpenHashMap<String>(KeyLayoutCache.allPossibleTags.size)
-  private val newTagIndices = newResults.keys.associateWith { IntOpenHashSet() }
+  private val newTagIndices = IntOpenHashSet()
   
-  private var allWordFragments = HashSet<String>(allResults.values.sumBy(IntList::size)).apply {
+  private var allWordFragments = HashSet<String>(allResults.size).apply {
-    for ((editor, offsets) in allResults) {
+    val iter = allResults.iterator()
-      val chars = editor.immutableText
+    while (iter.hasNext()) {
-      val iter = offsets.iterator()
+      forEachWordFragment(iter.nextInt()) { add(it) }
-      while (iter.hasNext()) {
-        forEachWordFragment(chars, iter.nextInt(), this::add)
-      }
     }
   }
   
-  private fun generateEligibleSites(availableTags: List<String>): Map<String, MutableList<Tag>> {
+  fun map(availableTags: List<String>, cache: EditorOffsetCache): Map<String, Int> {
-    val eligibleSitesByTag = HashMap<String, MutableList<Tag>>(100)
+    val eligibleSitesByTag = HashMap<String, IntList>(100)
     val tagsByFirstLetter = availableTags.groupBy { it[0] }
     
-    for ((editor, offsets) in newResults) {
+    val iter = newResults.iterator()
-      val chars = editor.immutableText
+    while (iter.hasNext()) {
-      val iter = offsets.iterator()
+      val site = iter.nextInt()
-      while (iter.hasNext()) {
-        val site = iter.nextInt()
       
-        for ((firstLetter, tags) in tagsByFirstLetter.entries) {
+      for ((firstLetter, tags) in tagsByFirstLetter.entries) {
-          if (canTagBeginWithChar(chars, site, firstLetter)) {
+        if (canTagBeginWithChar(site, firstLetter)) {
-            for (tag in tags) {
+          for (tag in tags) {
-              eligibleSitesByTag.getOrPut(tag, ::mutableListOf).add(Tag(editor, site))
+            eligibleSitesByTag.getOrPut(tag) { IntArrayList(10) }.add(site)
-            }
           }
         }
       }
     }
     
-    return eligibleSitesByTag
+    val matchingSites = HashMap<IntList, IntArray>()
-  }
+    val matchingSitesAsArrays = IdentityHashMap<String, IntArray>() // Keys are guaranteed to be from a single collection.
-  
-  private fun generateMatchingSites(
-    eligibleSites: Map<String, MutableList<Tag>>,
-    caches: Map<Editor, EditorOffsetCache>,
-  ): Map<String, Iterator<Tag>> {
-    val matchingSites = HashMap<MutableList<Tag>, Iterator<Tag>>()
-    val matchingSitesSorted = IdentityHashMap<String, Iterator<Tag>>() // Keys are guaranteed to be from a single collection.
-    
-    val siteOrder = siteOrder(caches)
-    
-    for ((mark, tags) in eligibleSites.entries) {
-      matchingSitesSorted[mark] = matchingSites.getOrPut(tags) {
-        @Suppress("ConvertLambdaToReference")
-        tags.toMutableList().apply { sortWith(siteOrder) }.iterator()
-      }
-    }
-    
-    return matchingSitesSorted
-  }
-  
-  fun map(availableTags: List<String>, caches: Map<Editor, EditorOffsetCache>): Map<String, Tag> {
-    val eligibleSitesByTag = generateEligibleSites(availableTags)
-    val matchingSitesSorted = generateMatchingSites(eligibleSitesByTag, caches)
     
+    val siteOrder = siteOrder(cache)
     val tagOrder = KeyLayoutCache.tagOrder
       .thenComparingInt { eligibleSitesByTag.getValue(it).size }
       .thenBy(AceConfig.layout.priority(String::last))
@@ -136,15 +105,20 @@ internal class Solver private constructor(
       sortWith(tagOrder)
     }
     
+    for ((key, value) in eligibleSitesByTag.entries) {
+      matchingSitesAsArrays[key] = matchingSites.getOrPut(value) {
+        value.toIntArray().apply { IntArrays.mergeSort(this, siteOrder) }
+      }
+    }
+    
     var totalAssigned = 0
-    val totalResults = newResults.values.sumBy(IntList::size)
     
     for (tag in sortedTags) {
-      if (totalAssigned == totalResults) {
+      if (totalAssigned == newResults.size) {
         break
       }
       
-      if (tryToAssignTag(tag, matchingSitesSorted.getValue(tag))) {
+      if (tryToAssignTag(tag, matchingSitesAsArrays.getValue(tag))) {
         totalAssigned++
       }
     }
@@ -152,63 +126,50 @@ internal class Solver private constructor(
     return newTags
   }
   
-  private fun tryToAssignTag(mark: String, tags: Iterator<Tag>): Boolean {
+  private fun tryToAssignTag(tag: String, sites: IntArray): Boolean {
-    if (newTags.containsKey(mark)) {
+    if (newTags.containsKey(tag)) {
       return false
     }
     
-    while (tags.hasNext()) {
+    val index = sites.firstOrNull { it !in newTagIndices } ?: return false
-      val tag = tags.next()
-      val assigned = newTagIndices.getValue(tag.editor)
     
-      if (tag.offset !in assigned) {
+    @Suppress("ReplacePutWithAssignment")
-        newTags[mark] = tag
+    newTags.put(tag, index)
-        assigned.add(tag.offset)
+    newTagIndices.add(index)
-        return true
+    return true
-      }
-    }
-    
-    return false
   }
   
-  private fun siteOrder(caches: Map<Editor, EditorOffsetCache>) = Comparator<Tag> { a, b ->
+  private fun siteOrder(cache: EditorOffsetCache) = IntComparator { a, b ->
-    val aEditor = a.editor
+    val aIsVisible = StandardBoundaries.VISIBLE_ON_SCREEN.isOffsetInside(editor, a, cache)
-    val bEditor = b.editor
+    val bIsVisible = StandardBoundaries.VISIBLE_ON_SCREEN.isOffsetInside(editor, b, cache)
     
-    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
-    }
-    
-    val aIsVisible = StandardBoundaries.VISIBLE_ON_SCREEN.isOffsetInside(aEditor, a.offset, caches.getValue(aEditor))
-    val bIsVisible = StandardBoundaries.VISIBLE_ON_SCREEN.isOffsetInside(bEditor, b.offset, caches.getValue(bEditor))
     if (aIsVisible != bIsVisible) {
       // Sites in immediate view should come first.
-      return@Comparator if (aIsVisible) -1 else 1
+      return@IntComparator if (aIsVisible) -1 else 1
     }
     
-    val aIsNotWordStart = aEditor.immutableText[max(0, a.offset - 1)].isWordPart
+    val chars = editor.immutableText
-    val bIsNotWordStart = bEditor.immutableText[max(0, b.offset - 1)].isWordPart
+    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@Comparator if (bIsNotWordStart) -1 else 1
+      return@IntComparator if (bIsNotWordStart) -1 else 1
     }
     
     when {
-      a.offset < b.offset -> -1
+      a < b -> -1
-      a.offset > b.offset -> 1
+      a > b -> 1
-      else                -> 0
+      else  -> 0
     }
   }
   
-  private fun canTagBeginWithChar(chars: CharSequence, site: Int, char: Char): Boolean {
+  private fun canTagBeginWithChar(site: Int, char: Char): Boolean {
     if (char.toString() in allWordFragments) {
       return false
     }
     
-    forEachWordFragment(chars, site) {
+    forEachWordFragment(site) {
       if (it + char in allWordFragments) {
         return false
       }
@@ -217,7 +178,8 @@ internal class Solver private constructor(
     return true
   }
   
-  private inline fun forEachWordFragment(chars: CharSequence, site: Int, callback: (String) -> Unit) {
+  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)
     

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,6 +1,5 @@
 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
@@ -12,25 +11,23 @@ import org.acejump.immutableText
 import org.acejump.input.KeyLayoutCache.allPossibleTags
 import org.acejump.isWordPart
 import org.acejump.matchesAt
-import org.acejump.view.TagMarker
+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, updates them when the search query changes, and requests a jump if the search query matches a tag.
- * The ordering of [editors] may be used to prioritize tagging editors earlier in the list in case of conflicts.
  */
-class Tagger(private val editors: List<Editor>) {
+class Tagger(private val editor: Editor) {
-  private var tagMap = HashBiMap.create<String, Tag>()
+  private var tagMap = HashBiMap.create<String, Int>()
   
   val hasTags
     get() = tagMap.isNotEmpty()
   
   @ExternalUsage
   internal val tags
-    get() = tagMap.map { SimpleImmutableEntry(it.key, it.value) }.sortedBy { it.value.offset }
+    get() = tagMap.map { SimpleImmutableEntry(it.key, it.value) }.sortedBy { it.value }
     
   /**
    * Removes all markers, allowing them to be regenerated from scratch.
@@ -46,7 +43,7 @@ class Tagger(private val editors: List<Editor>) {
    *
    * Note that the [results] collection will be mutated.
    */
-  internal fun update(query: SearchQuery, results: Map<Editor, IntList>): TaggingResult {
+  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()
     
@@ -60,9 +57,7 @@ class Tagger(private val editors: List<Editor>) {
       }
       
       if (queryText.length == 1) {
-        for ((editor, offsets) in results) {
+        removeResultsWithOverlappingTags(results)
-          removeResultsWithOverlappingTags(editor, offsets)
-        }
       }
     }
     
@@ -70,86 +65,75 @@ class Tagger(private val editors: List<Editor>) {
       tagMap = assignTagsAndMerge(results, availableTags, query, queryText)
     }
     
-    val resultTags = results.flatMap { (editor, offsets) -> offsets.map { Tag(editor, it) } }
+    return TaggingResult.Mark(createTagMarkers(results, query.rawText.ifEmpty { null }))
-    return TaggingResult.Mark(createTagMarkers(resultTags, 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(
+  private fun assignTagsAndMerge(results: IntList, availableTags: List<String>, query: SearchQuery, queryText: String): HashBiMap<String, Int> {
-    results: Map<Editor, IntList>, availableTags: List<String>, query: SearchQuery, queryText: String,
+    val cache = EditorOffsetCache.new()
-  ): HashBiMap<String, Tag> {
-    val caches = results.keys.associateWith { EditorOffsetCache.new() }
     
-    for ((editor, offsets) in results) {
+    results.sort { a, b ->
-      val cache = caches.getValue(editor)
+      val aIsVisible = StandardBoundaries.VISIBLE_ON_SCREEN.isOffsetInside(editor, a, cache)
+      val bIsVisible = StandardBoundaries.VISIBLE_ON_SCREEN.isOffsetInside(editor, b, cache)
       
-      offsets.sort { a, b ->
+      when {
-        val aIsVisible = StandardBoundaries.VISIBLE_ON_SCREEN.isOffsetInside(editor, a, cache)
+        aIsVisible && !bIsVisible -> -1
-        val bIsVisible = StandardBoundaries.VISIBLE_ON_SCREEN.isOffsetInside(editor, b, cache)
+        bIsVisible && !aIsVisible -> 1
-        
+        else                      -> 0
-        when {
-          aIsVisible && !bIsVisible -> -1
-          bIsVisible && !aIsVisible -> 1
-          else                      -> 0
-        }
       }
     }
     
-    val allAssignedTags = mutableMapOf<String, Tag>()
+    val allAssignedTags = mutableMapOf<String, Int>()
-    val oldCompatibleTags = tagMap.filter { (mark, tag) ->
+    val oldCompatibleTags = tagMap.filter { isTagCompatibleWithQuery(it.key, it.value, queryText) || it.value in results }
-      isTagCompatibleWithQuery(mark, tag, queryText) || results[tag.editor]?.contains(tag.offset) == true
+    val vacantResults: IntList
-    }
-    
-    val vacantResults: Map<Editor, IntList>
     
     if (oldCompatibleTags.isEmpty()) {
       vacantResults = results
     }
     else {
-      val vacant = mutableMapOf<Editor, IntList>()
+      vacantResults = IntArrayList()
       
-      for ((editor, offsets) in results) {
+      val iter = results.iterator()
-        val list = IntArrayList()
+      while (iter.hasNext()) {
-        val iter = offsets.iterator()
+        val offset = iter.nextInt()
     
-        while (iter.hasNext()) {
+        if (offset !in oldCompatibleTags.values) {
-          val tag = Tag(editor, iter.nextInt())
+          vacantResults.add(offset)
-          if (tag !in oldCompatibleTags.values) {
-            list.add(tag.offset)
-          }
         }
-        
-        vacant[editor] = list
       }
-      
-      vacantResults = vacant
     }
     
     allAssignedTags.putAll(oldCompatibleTags)
-    allAssignedTags.putAll(Solver.solve(editors, query, vacantResults, results, availableTags, caches))
+    allAssignedTags.putAll(Solver.solve(editor, query, vacantResults, results, availableTags, cache))
-    
-    val assignedMarkers = allAssignedTags.keys.groupBy { it[0] }
     
     return allAssignedTags.mapKeysTo(HashBiMap.create(allAssignedTags.size)) { (tag, _) ->
-      if (canShortenTag(tag, assignedMarkers, queryText))
+      // 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, Tag>.solves(query: String): Boolean {
+  private infix fun Map.Entry<String, Int>.solves(query: String): Boolean {
     return query.endsWith(key, true) && isTagCompatibleWithQuery(key, value, query)
   }
   
-  private fun isTagCompatibleWithQuery(marker: String, tag: Tag, query: String): Boolean {
+  private fun isTagCompatibleWithQuery(tag: String, offset: Int, query: String): Boolean {
-    return tag.editor.immutableText.matchesAt(tag.offset, getPlaintextPortion(query, marker), ignoreCase = true)
+    return editor.immutableText.matchesAt(offset, getPlaintextPortion(query, tag), ignoreCase = true)
   }
   
-  fun isQueryCompatibleWithTagAt(query: String, tag: Tag): Boolean {
+  fun isQueryCompatibleWithTagAt(query: String, offset: Int): Boolean {
-    return tagMap.inverse()[tag].let { it != null && isTagCompatibleWithQuery(it, tag, query) }
+    return tagMap.inverse()[offset].let { it != null && isTagCompatibleWithQuery(it, offset, query) }
   }
   
   fun canQueryMatchAnyTag(query: String): Boolean {
@@ -159,8 +143,8 @@ class Tagger(private val editors: List<Editor>) {
     }
   }
   
-  private fun removeResultsWithOverlappingTags(editor: Editor, offsets: IntList) {
+  private fun removeResultsWithOverlappingTags(results: IntList) {
-    val iter = offsets.iterator()
+    val iter = results.iterator()
     val chars = editor.immutableText
     
     while (iter.hasNext()) {
@@ -170,18 +154,9 @@ class Tagger(private val editors: List<Editor>) {
     }
   }
   
-  private fun createTagMarkers(tags: Collection<Tag>, literalQueryText: String?): MutableMap<Editor, Collection<TagMarker>> {
+  private fun createTagMarkers(results: IntList, literalQueryText: String?): List<Tag> {
     val tagMapInv = tagMap.inverse()
-    val markers = ArrayListMultimap.create<Editor, TagMarker>(editors.size, min(tags.size, 50))
+    return results.mapNotNull { index -> tagMapInv[index]?.let { tag -> Tag.create(editor, tag, index, literalQueryText) } }
-    
-    for (tag in tags) {
-      val mark = tagMapInv[tag] ?: continue
-      val editor = tag.editor
-      val marker = TagMarker.create(editor, mark, tag.offset, literalQueryText)
-      markers.put(editor, marker)
-    }
-    
-    return markers.asMap()
   }
   
   private companion object {
@@ -202,28 +177,26 @@ class Tagger(private val editors: List<Editor>) {
       return this.isWordPart xor other.isWordPart || this.isWhitespace() xor other.isWhitespace()
     }
     
-    private fun getPlaintextPortion(query: String, marker: String) = when {
+    private fun getPlaintextPortion(query: String, tag: String) = when {
-      query.endsWith(marker, true)         -> query.dropLast(marker.length)
+      query.endsWith(tag, true)         -> query.dropLast(tag.length)
-      query.endsWith(marker.first(), true) -> query.dropLast(1)
+      query.endsWith(tag.first(), true) -> query.dropLast(1)
-      else                                 -> query
+      else                              -> query
     }
   
-    private fun getTagPortion(query: String, marker: String) = when {
+    private fun getTagPortion(query: String, tag: String) = when {
-      query.endsWith(marker, true)         -> query.takeLast(marker.length)
+      query.endsWith(tag, true)         -> query.takeLast(tag.length)
-      query.endsWith(marker.first(), true) -> query.takeLast(1)
+      query.endsWith(tag.first(), true) -> query.takeLast(1)
-      else                                 -> ""
+      else                              -> ""
     }
     
-    private fun canShortenTag(marker: String, markers: Map<Char, List<String>>, queryText: String): Boolean {
+    private fun canShortenTag(tag: String, tagMap: Map<String, Int>): Boolean {
-      // Avoid matching query - will trigger a jump.
+      for (other in tagMap.keys) {
-      // TODO: lift this constraint.
+        if (tag != other && tag[0] == other[0]) {
-      val queryEndsWith = queryText.endsWith(marker[0]) || queryText.endsWith(marker)
+          return false
-      if (queryEndsWith) {
+        }
-        return false
       }
       
-      val startingWithSameLetter = markers[marker[0]]
+      return true
-      return startingWithSameLetter == null || startingWithSameLetter.singleOrNull() == marker
     }
   }
 }

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

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

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

@@ -1,19 +1,22 @@
 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 com.intellij.ui.LightweightHint
 import org.acejump.ExternalUsage
 import org.acejump.boundaries.Boundaries
-import org.acejump.boundaries.StandardBoundaries
-import org.acejump.clone
 import org.acejump.config.AceConfig
+import org.acejump.immutableText
 import org.acejump.input.EditorKeyListener
 import org.acejump.input.KeyLayoutCache
+import org.acejump.modes.BetweenPointsMode
 import org.acejump.modes.JumpMode
 import org.acejump.modes.SessionMode
 import org.acejump.search.*
@@ -23,36 +26,34 @@ import org.acejump.view.TextHighlighter
 /**
  * Manages an AceJump session for a single [Editor].
  */
-class Session(private val mainEditor: Editor, private val jumpEditors: List<Editor>) {
+class Session(private val editor: Editor) {
-  private val editorSettings = EditorSettings.setup(mainEditor)
+  private val editorSettings = EditorSettings.setup(editor)
   private lateinit var mode: SessionMode
   
   private var state: SessionStateImpl? = null
-  private var tagger = Tagger(jumpEditors)
+  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)
+        tagCanvas.removeMarkers()
-        editorSettings.onTagAccepted(mainEditor)
+        editorSettings.onTagAccepted(editor)
       }
     }
   
-  private val textHighlighter = TextHighlighter()
+  private val textHighlighter = TextHighlighter(editor)
-  private val tagCanvases = jumpEditors.associateWith(::TagCanvas)
+  private val tagCanvas = TagCanvas(editor)
   
   @ExternalUsage
   val tags
     get() = tagger.tags
   
-  var defaultBoundary: Boundaries = StandardBoundaries.VISIBLE_ON_SCREEN
-  
   init {
     KeyLayoutCache.ensureInitialized(AceConfig.settings)
     
-    EditorKeyListener.attach(mainEditor, object : TypedActionHandler {
+    EditorKeyListener.attach(editor, object : TypedActionHandler {
       override fun execute(editor: Editor, charTyped: Char, context: DataContext) {
         val state = state ?: return
         val hadTags = tagger.hasTags
@@ -62,14 +63,10 @@ class Session(private val mainEditor: Editor, private val jumpEditors: List<Edit
         editorSettings.stopEditing(editor)
         
         when (result) {
-          TypeResult.Nothing          -> return;
+          TypeResult.Nothing          -> updateHint()
+          TypeResult.RestartSearch    -> restart().also { this@Session.state = SessionStateImpl(editor, tagger); updateHint() }
           is TypeResult.UpdateResults -> updateSearch(result.processor, markImmediately = hadTags)
           is TypeResult.ChangeMode    -> setMode(result.mode)
-          
-          TypeResult.RestartSearch    -> restart().also {
-            this@Session.state = SessionStateImpl(jumpEditors, tagger, defaultBoundary)
-          }
-          
           TypeResult.EndSession       -> end()
         }
       }
@@ -90,65 +87,80 @@ class Session(private val mainEditor: Editor, private val jumpEditors: List<Edit
     
     when (val result = tagger.update(query, results.clone())) {
       is TaggingResult.Accept -> {
-        acceptedTag = result.tag
+        val offset = result.offset
-        textHighlighter.renderFinal(result.tag, processor.query)
+        acceptedTag = offset
-        
+        textHighlighter.renderFinal(offset, processor.query)
-        if (state?.let { mode.accept(it, result.tag) } == true) {
-          end()
-          return
-        }
       }
       
       is TaggingResult.Mark   -> {
-        for ((editor, canvas) in tagCanvases) {
+        val tags = result.tags
-          canvas.setMarkers(result.markers[editor].orEmpty())
+        tagCanvas.setMarkers(tags)
-        }
-        
         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() {
+  private fun updateHint() {
-    startJumpMode(::JumpMode)
+    val hintArray = mode.getHint(acceptedTag, state?.currentProcessor.let { it != null && it.query.rawText.isNotEmpty() }) ?: return
+    val hintText = hintArray
+      .joinToString("\n")
+      .replace("<f>", "<span style=\"font-family:'${editor.colorsScheme.editorFontName}';font-weight:bold\">")
+      .replace("</f>", "</span>")
+    
+    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) {
+  fun cycleMode() {
-    if (this::mode.isInitialized && mode is JumpMode) {
+    if (!this::mode.isInitialized) {
-      end()
+      setMode(JumpMode())
+      state = SessionStateImpl(editor, tagger)
       return
     }
     
-    if (this::mode.isInitialized) {
+    restart()
-      restart()
+    setMode(when (mode) {
-    }
+      is JumpMode -> BetweenPointsMode()
+      else        -> JumpMode()
+    })
     
-    setMode(mode())
+    state = SessionStateImpl(editor, tagger)
-    state = SessionStateImpl(jumpEditors, tagger, defaultBoundary)
   }
   
   /**
    * Starts a regular expression search. If a search was already active, it will be reset alongside its tags and highlights.
    */
-  fun startRegexSearch(pattern: Pattern) {
+  fun startRegexSearch(pattern: String, boundaries: Boundaries) {
     if (!this::mode.isInitialized) {
       setMode(JumpMode())
     }
     
-    tagger = Tagger(jumpEditors)
+    tagger = Tagger(editor)
-    tagCanvases.values.forEach { it.setMarkers(emptyList()) }
+    tagCanvas.setMarkers(emptyList())
-    
-    val processor = SearchProcessor.fromRegex(jumpEditors, pattern.regex, defaultBoundary)
-    state = SessionStateImpl(jumpEditors, tagger, defaultBoundary, processor)
     
+    val processor = SearchProcessor.fromRegex(editor, pattern, boundaries).also { state = SessionStateImpl(editor, tagger, it) }
     updateSearch(processor, markImmediately = true)
   }
   
+  /**
+   * 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)
+  }
+  
   fun tagImmediately() {
     val state = state ?: return
     val processor = state.currentProcessor
@@ -156,13 +168,22 @@ class Session(private val mainEditor: Editor, private val jumpEditors: List<Edit
     if (processor != null) {
       updateSearch(processor, markImmediately = true)
     }
+    else if (mode is JumpMode) {
+      val offset = editor.caretModel.offset
+      val result = editor.immutableText.getOrNull(offset)?.let(state::type)
+      if (result is TypeResult.UpdateResults) {
+        acceptedTag = offset
+        textHighlighter.renderFinal(offset, result.processor.query)
+        updateHint()
+      }
+    }
   }
   
   /**
    * Ends this session.
    */
   fun end() {
-    SessionManager.end(mainEditor)
+    SessionManager.end(editor)
   }
   
   /**
@@ -170,33 +191,31 @@ class Session(private val mainEditor: Editor, private val jumpEditors: List<Edit
    */
   fun restart() {
     state = null
-    tagger = Tagger(jumpEditors)
+    tagger = Tagger(editor)
     acceptedTag = null
-    tagCanvases.values.forEach(TagCanvas::removeMarkers)
+    tagCanvas.removeMarkers()
     textHighlighter.reset()
     
     HintManagerImpl.getInstanceImpl().hideAllHints()
-    editorSettings.onTagUnaccepted(mainEditor)
+    editorSettings.onTagUnaccepted(editor)
-    mainEditor.colorsScheme.setColor(EditorColors.CARET_COLOR, mode.caretColor)
+    editor.colorsScheme.setColor(EditorColors.CARET_COLOR, mode.caretColor)
-    jumpEditors.forEach { it.contentComponent.repaint() }
+    editor.contentComponent.repaint()
   }
   
   /**
    * Should only be used from [SessionManager] to dispose a successfully ended session.
    */
   internal fun dispose() {
-    tagger = Tagger(jumpEditors)
+    tagger = Tagger(editor)
-    tagCanvases.values.forEach(TagCanvas::unbind)
+    tagCanvas.unbind()
     textHighlighter.reset()
-    EditorKeyListener.detach(mainEditor)
+    EditorKeyListener.detach(editor)
     
-    if (!mainEditor.isDisposed) {
+    if (!editor.isDisposed) {
       HintManagerImpl.getInstanceImpl().hideAllHints()
-      editorSettings.restore(mainEditor)
+      editorSettings.restore(editor)
-      mainEditor.colorsScheme.setColor(EditorColors.CARET_COLOR, AbstractColorsScheme.INHERITED_COLOR_MARKER)
+      editor.colorsScheme.setColor(EditorColors.CARET_COLOR, AbstractColorsScheme.INHERITED_COLOR_MARKER)
-      
+      editor.scrollingModel.scrollToCaret(ScrollType.MAKE_VISIBLE)
-      val focusedEditor = acceptedTag?.editor ?: mainEditor
-      focusedEditor.scrollingModel.scrollToCaret(ScrollType.MAKE_VISIBLE)
     }
   }
 }

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))
+    return sessions.getOrPut(editor) { cleanup(); Session(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) }
   }
   
   /**

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

@@ -1,9 +1,10 @@
 package org.acejump.session
 
+import com.intellij.openapi.editor.Editor
 import org.acejump.action.AceTagAction
-import org.acejump.search.Tag
 
 interface SessionState {
+  val editor: Editor
   fun type(char: Char): TypeResult
-  fun act(action: AceTagAction, tag: Tag, shiftMode: Boolean, isFinal: Boolean)
+  fun act(action: AceTagAction, offset: Int, shiftMode: Boolean)
 }

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

@@ -2,24 +2,18 @@ package org.acejump.session
 
 import com.intellij.openapi.editor.Editor
 import org.acejump.action.AceTagAction
-import org.acejump.boundaries.Boundaries
+import org.acejump.boundaries.StandardBoundaries
 import org.acejump.search.SearchProcessor
-import org.acejump.search.Tag
 import org.acejump.search.Tagger
 
-internal class SessionStateImpl(
+internal class SessionStateImpl(override val editor: Editor, private val tagger: Tagger, processor: SearchProcessor? = null) : SessionState {
-  private val jumpEditors: List<Editor>,
-  private val tagger: Tagger,
-  private val defaultBoundary: Boundaries,
-  processor: SearchProcessor? = null
-) : SessionState {
   internal var currentProcessor: SearchProcessor? = processor
   
   override fun type(char: Char): TypeResult {
     val processor = currentProcessor
     
     if (processor == null) {
-      val newProcessor = SearchProcessor.fromChar(jumpEditors, char, defaultBoundary)
+      val newProcessor = SearchProcessor.fromChar(editor, char, StandardBoundaries.VISIBLE_ON_SCREEN)
       return TypeResult.UpdateResults(newProcessor.also { currentProcessor = it })
     }
     
@@ -30,7 +24,7 @@ internal class SessionStateImpl(
     return TypeResult.Nothing
   }
   
-  override fun act(action: AceTagAction, tag: Tag, shiftMode: Boolean, isFinal: Boolean) {
+  override fun act(action: AceTagAction, offset: Int, shiftMode: Boolean) {
-    currentProcessor?.let { action(tag.editor, it, tag.offset, shiftMode, isFinal) }
+    currentProcessor?.let { action(editor, it, offset, shiftMode) }
   }
 }

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

@@ -5,8 +5,8 @@ import org.acejump.search.SearchProcessor
 
 sealed class TypeResult {
   object Nothing : TypeResult()
+  object RestartSearch : TypeResult()
   class UpdateResults(val processor: SearchProcessor) : TypeResult()
   class ChangeMode(val mode: SessionMode) : TypeResult()
-  object RestartSearch : TypeResult()
   object EndSession : TypeResult()
 }

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

@@ -1,10 +1,11 @@
 package org.acejump.view
 
 import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.util.SystemInfo
+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
@@ -16,7 +17,7 @@ import kotlin.math.max
 /**
  * Describes a 1 or 2 character shortcut that points to a specific character in the editor.
  */
-internal class TagMarker(
+internal class Tag(
   private val tag: String,
   val offsetL: Int,
   val offsetR: Int,
@@ -28,18 +29,11 @@ internal class TagMarker(
   companion object {
     private const val ARC = 1
     
-    /**
-     * TODO This might be due to DPI settings.
-     */
-    private val HIGHLIGHT_OFFSET = if (SystemInfo.isMac) -0.5 else 0.0
-    
-    private val SHADOW_COLOR = Color(0F, 0F, 0F, 0.35F)
-    
     /**
      * 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?): TagMarker {
+    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()
@@ -49,7 +43,7 @@ internal class TagMarker(
       else
         tag.toUpperCase()
       
-      return TagMarker(displayedTag, offset, offset + max(0, matching - 1), tag.length - displayedTag.length, hasSpaceRight)
+      return Tag(displayedTag, offset, offset + max(0, matching - 1), tag.length - displayedTag.length, hasSpaceRight)
     }
     
     /**
@@ -57,9 +51,7 @@ internal class TagMarker(
      */
     private fun drawHighlight(g: Graphics2D, rect: Rectangle, color: Color) {
       g.color = color
-      g.translate(0.0, HIGHLIGHT_OFFSET)
       g.fillRoundRect(rect.x, rect.y, rect.width, rect.height + 1, ARC, ARC)
-      g.translate(0.0, -HIGHLIGHT_OFFSET)
     }
     
     /**
@@ -71,12 +63,12 @@ internal class TagMarker(
   
       g.font = font.tagFont
       
-      if (!font.isForegroundDark) {
+      if (!ColorUtil.isDark(AceConfig.tagForegroundColor)) {
-        g.color = SHADOW_COLOR
+        g.color = Color(0F, 0F, 0F, 0.35F)
         g.drawString(text, x + 1, y + 1)
       }
       
-      g.color = font.foregroundColor
+      g.color = AceConfig.tagForegroundColor
       g.drawString(text, x, y)
     }
   }
@@ -96,7 +88,7 @@ internal class TagMarker(
   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, font.backgroundColor)
+    drawHighlight(g, rect, AceConfig.tagBackgroundColor)
     drawForeground(g, font, rect.location, tag)
     
     occupied.add(JBUIScale.scale(2).let { Rectangle(rect.x - it, rect.y, rect.width + (2 * it), rect.height) })

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

@@ -17,7 +17,7 @@ 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(), CaretListener {
-  private var markers: Collection<TagMarker>? = null
+  private var markers: List<Tag>? = null
   
   init {
     val contentComponent = editor.contentComponent
@@ -45,7 +45,7 @@ internal class TagCanvas(private val editor: Editor) : JComponent(), CaretListen
     repaint()
   }
   
-  fun setMarkers(markers: Collection<TagMarker>) {
+  fun setMarkers(markers: List<Tag>) {
     this.markers = markers
     repaint()
   }
@@ -64,15 +64,14 @@ internal class TagCanvas(private val editor: Editor) : JComponent(), CaretListen
     super.paintChildren(g)
     
     val markers = markers ?: return
-    
-    (g as Graphics2D).setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON)
-    
     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.
     

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

@@ -2,22 +2,16 @@ package org.acejump.view
 
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.colors.EditorFontType
-import com.intellij.ui.ColorUtil
-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.BOLD)
   val tagCharWidth = editor.component.getFontMetrics(tagFont).charWidth('W')
   
-  val foregroundColor = AceConfig.tagForegroundColor
-  var backgroundColor = AceConfig.tagBackgroundColor
-  val isForegroundDark = ColorUtil.isDark(foregroundColor)
-  
   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/TextHighlighter.kt

@@ -12,21 +12,20 @@ import org.acejump.boundaries.EditorOffsetCache
 import org.acejump.config.AceConfig
 import org.acejump.immutableText
 import org.acejump.search.SearchQuery
-import org.acejump.search.Tag
 import java.awt.Color
 import java.awt.Graphics
 
 /**
  * Renders highlights for search occurrences.
  */
-internal class TextHighlighter {
+internal class TextHighlighter(private val editor: Editor) {
-  private var previousHighlights = mutableMapOf<Editor, Array<RangeHighlighter>>()
+  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) {
+  fun renderOccurrences(offsets: IntList, query: SearchQuery) {
-    render(results, when (query) {
+    render(offsets, when (query) {
       is SearchQuery.RegularExpression -> RegexRenderer
       else                             -> SearchedWordRenderer
     }, query::getHighlightLength)
@@ -35,52 +34,43 @@ internal class TextHighlighter {
   /**
    * Removes all current highlights and re-adds a single highlight at the position of the accepted tag with a different color.
    */
-  fun renderFinal(tag: Tag, query: SearchQuery) {
+  fun renderFinal(offset: Int, query: SearchQuery) {
-    render(mutableMapOf(tag.editor to IntArrayList(intArrayOf(tag.offset))), AcceptedTagRenderer, query::getHighlightLength)
+    render(IntArrayList(intArrayOf(offset)), AcceptedTagRenderer, query::getHighlightLength)
   }
   
-  private inline fun render(results: Map<Editor, IntList>, renderer: CustomHighlighterRenderer, getHighlightLength: (CharSequence, Int) -> Int) {
+  private inline fun render(offsets: IntList, renderer: CustomHighlighterRenderer, getHighlightLength: (CharSequence, Int) -> Int) {
-    for ((editor, offsets) in results) {
+    val markup = editor.markupModel
-      val highlights = previousHighlights[editor]
+    val chars = editor.immutableText
     
-      val markup = editor.markupModel
+    val modifications = (previousHighlights?.size ?: 0) + offsets.size
-      val document = editor.document
+    val enableBulkEditing = modifications > 1000
-      val chars = editor.immutableText
     
-      val modifications = (highlights?.size ?: 0) + offsets.size
+    val document = editor.document
-      val enableBulkEditing = modifications > 1000
     
-      try {
+    try {
-        if (enableBulkEditing) {
+      if (enableBulkEditing) {
-          document.isInBulkUpdate = true
+        document.isInBulkUpdate = true
-        }
+      }
       
-        highlights?.forEach(markup::removeHighlighter)
+      previousHighlights?.forEach(markup::removeHighlighter)
-        previousHighlights[editor] = Array(offsets.size) { index ->
+      previousHighlights = Array(offsets.size) { index ->
-          val start = offsets.getInt(index)
+        val start = offsets.getInt(index)
-          val end = start + getHighlightLength(chars, start)
+        val end = start + getHighlightLength(chars, start)
         
-          markup.addRangeHighlighter(start, end, LAYER, null, HighlighterTargetArea.EXACT_RANGE).apply {
+        markup.addRangeHighlighter(start, end, LAYER, null, HighlighterTargetArea.EXACT_RANGE).apply {
-            customRenderer = renderer
+          customRenderer = renderer
-          }
-        }
-      } finally {
-        if (enableBulkEditing) {
-          document.isInBulkUpdate = false
         }
       }
-    }
+    } finally {
-    
+      if (enableBulkEditing) {
-    for (editor in previousHighlights.keys.toList()) {
+        document.isInBulkUpdate = false
-      if (!results.containsKey(editor)) {
-        previousHighlights.remove(editor)?.forEach(editor.markupModel::removeHighlighter)
       }
     }
   }
   
   fun reset() {
-    previousHighlights.keys.forEach { it.markupModel.removeAllHighlighters() }
+    editor.markupModel.removeAllHighlighters()
-    previousHighlights.clear()
+    previousHighlights = null
   }
   
   /**

src/main/kotlin/org/acejump/vim/AceVimExtension.kt

@@ -1,59 +0,0 @@
-package org.acejump.vim
-
-import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.command.MappingMode
-import com.maddyhome.idea.vim.extension.VimExtension
-import com.maddyhome.idea.vim.extension.VimExtensionFacade
-import com.maddyhome.idea.vim.key.MappingOwner
-import org.acejump.boundaries.StandardBoundaries
-import org.acejump.search.Pattern
-
-class AceVimExtension : VimExtension {
-  private companion object {
-    const val NAME = "AceJump"
-    const val PLUG_PREFIX = "<Plug>(acejump)"
-    
-    private val OWNER = MappingOwner.Plugin.get(NAME)
-    
-    private fun register(keys: String, mode: AceVimMode) {
-      val keysPrefixed = injector.parser.parseKeys("${PLUG_PREFIX}$keys")
-      val keysCommand = injector.parser.parseKeys(command(keys))
-      
-      VimExtensionFacade.putExtensionHandlerMapping(MappingMode.NVO, keysCommand, OWNER, AceVimHandler(mode), false)
-      VimExtensionFacade.putKeyMapping(MappingMode.NVO, keysPrefixed, OWNER, keysCommand, true)
-    }
-    
-    private fun command(name: String): String {
-      return "<Plug>(acejump-$name)"
-    }
-  }
-  
-  override fun getName(): String {
-    return NAME
-  }
-  
-  override fun init() {
-    register("<Space>", AceVimMode.JumpAllEditors)
-    register("s", AceVimMode.JumpAllEditors)
-    
-    register("f", AceVimMode.Jump(StandardBoundaries.AFTER_CARET))
-    register("F", AceVimMode.Jump(StandardBoundaries.BEFORE_CARET))
-    register("t", AceVimMode.JumpTillForward(StandardBoundaries.AFTER_CARET))
-    register("T", AceVimMode.JumpTillBackward(StandardBoundaries.BEFORE_CARET))
-    
-    register("w", AceVimMode.JumpToPattern(Pattern.VIM_LWORD, StandardBoundaries.AFTER_CARET))
-    register("W", AceVimMode.JumpToPattern(Pattern.VIM_UWORD, StandardBoundaries.AFTER_CARET))
-    register("b", AceVimMode.JumpToPattern(Pattern.VIM_LWORD, StandardBoundaries.BEFORE_CARET))
-    register("B", AceVimMode.JumpToPattern(Pattern.VIM_UWORD, StandardBoundaries.BEFORE_CARET))
-    register("e", AceVimMode.JumpToPattern(Pattern.VIM_LWORD_END, StandardBoundaries.AFTER_CARET))
-    register("E", AceVimMode.JumpToPattern(Pattern.VIM_LWORD_END, StandardBoundaries.AFTER_CARET))
-    register("ge", AceVimMode.JumpToPattern(Pattern.VIM_UWORD_END, StandardBoundaries.BEFORE_CARET))
-    register("gE", AceVimMode.JumpToPattern(Pattern.VIM_UWORD_END, StandardBoundaries.BEFORE_CARET))
-    
-    register("j", AceVimMode.JumpToPattern(Pattern.LINE_INDENTS, StandardBoundaries.AFTER_CARET))
-    register("k", AceVimMode.JumpToPattern(Pattern.LINE_INDENTS, StandardBoundaries.BEFORE_CARET))
-    
-    register("l", AceVimMode.Jump(StandardBoundaries.AFTER_CARET.intersection(StandardBoundaries.CARET_LINE)))
-    register("h", AceVimMode.Jump(StandardBoundaries.BEFORE_CARET.intersection(StandardBoundaries.CARET_LINE)))
-  }
-}

src/main/kotlin/org/acejump/vim/AceVimHandler.kt

@@ -1,92 +0,0 @@
-package org.acejump.vim
-
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.application.WriteAction
-import com.maddyhome.idea.vim.KeyHandler
-import com.maddyhome.idea.vim.VimPlugin
-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.ExecutionContext
-import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.command.MappingMode
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.command.VimStateMachine
-import com.maddyhome.idea.vim.extension.ExtensionHandler
-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.helper.vimStateMachine
-import com.maddyhome.idea.vim.newapi.ij
-import org.acejump.action.AceTagAction
-import org.acejump.modes.JumpMode
-import org.acejump.search.Tag
-import org.acejump.session.SessionManager
-import org.acejump.session.SessionState
-
-class AceVimHandler(private val mode: AceVimMode) : ExtensionHandler {
-  override fun execute(editor: VimEditor, context: ExecutionContext) {
-    val ij = editor.ij
-    val caret = ij.caretModel.currentCaret
-    val initialOffset = caret.offset
-    val selectionStart = if (ij.inVisualMode) caret.vimSelectionStart else null
-    
-    val session = SessionManager.start(ij, mode.getJumpEditors(ij))
-    
-    session.defaultBoundary = mode.boundaries
-    session.startJumpMode {
-      object : JumpMode() {
-        override fun accept(state: SessionState, acceptedTag: Tag): Boolean {
-          state.act(AceTagAction.JumpToSearchStart, acceptedTag, wasUpperCase, isFinal = true)
-          
-          if (selectionStart != null) {
-            caret.vimSetSelection(selectionStart, caret.offset, moveCaretToSelectionEnd = true)
-          }
-          else {
-            val commandState = editor.vimStateMachine
-            if (commandState.isOperatorPending) {
-              val key = commandState.commandBuilder.keys.singleOrNull()?.keyChar
-              
-              commandState.reset()
-              KeyHandler.getInstance().fullReset(editor)
-              
-              VimPlugin.getVisualMotion().enterVisualMode(editor, VimStateMachine.SubMode.VISUAL_CHARACTER)
-              caret.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> {
-                    commandState.commandBuilder.pushCommandPart(action)
-                    
-                    val cmd = commandState.commandBuilder.buildCommand()
-                    val operatorArguments = OperatorArguments(
-                      commandState.mappingState.mappingMode == MappingMode.OP_PENDING,
-                      cmd.rawCount, commandState.mode, commandState.subMode
-                    )
-                    
-                    commandState.setExecutingCommand(cmd)
-                    injector.actionExecutor.executeVimAction(editor, action, context, operatorArguments)
-                    // TODO does not update status
-                  }
-                }
-              }
-            }
-          }
-          
-          mode.finishSession(ij, session)
-          return true
-        }
-      }
-    }
-    
-    mode.setupSession(ij, session)
-  }
-}

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

@@ -1,64 +0,0 @@
-package org.acejump.vim
-
-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 {
-  open val boundaries: Boundaries
-    get() = StandardBoundaries.VISIBLE_ON_SCREEN
-  
-  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 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/resources/META-INF/acejump-ideavim.xml

@@ -1,5 +0,0 @@
-<idea-plugin>
-  <extensions defaultExtensionNs="IdeaVIM">
-    <vimExtension implementation="org.acejump.vim.AceVimExtension" name="acejump" />
-  </extensions>
-</idea-plugin>

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.
@@ -13,8 +13,6 @@
   <category>Navigation</category>
   <vendor url="https://github.com/acejump/AceJump">AceJump</vendor>
 
-  <depends optional="true" config-file="acejump-ideavim.xml">IdeaVIM</depends>
-
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceImplementation="org.acejump.config.AceConfig"/>
     <applicationConfigurable groupId="tools" displayName="AceJump"
@@ -27,36 +25,50 @@
                          implementationClass="org.acejump.action.AceEditorAction$ClearSearch"/>
     <editorActionHandler action="EditorEnter" order="first"
                          implementationClass="org.acejump.action.AceEditorAction$TagImmediately"/>
+    <editorActionHandler action="EditorUp" order="first"
+                         implementationClass="org.acejump.action.AceEditorAction$SearchLineStarts"/>
+    <editorActionHandler action="EditorLeft" order="first"
+                         implementationClass="org.acejump.action.AceEditorAction$SearchLineIndents"/>
+    <editorActionHandler action="EditorLineStart" order="first"
+                         implementationClass="org.acejump.action.AceEditorAction$SearchLineIndents"/>
+    <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="AceAction"
             class="org.acejump.action.AceKeyboardAction$ActivateAceJump"
-            text="Activate AceJump">
+            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="AceVimAction_GoToDeclaration"
+    <action id="AceLineAction"
-            class="org.acejump.action.AceVimAction$GoToDeclaration"
+            class="org.acejump.action.AceKeyboardAction$StartAllLineMarksMode"
-            text="AceJump Vim - GoToDeclaration"/>
+            text="Start AceJump in All Line Marks Mode">
-    <action id="AceVimAction_GoToTypeDeclaration"
+      <keyboard-shortcut keymap="Mac OS X" first-keystroke="ctrl shift SEMICOLON"/>
-            class="org.acejump.action.AceVimAction$GoToTypeDeclaration"
+      <keyboard-shortcut keymap="Mac OS X 10.5+" first-keystroke="ctrl shift SEMICOLON"/>
-            text="AceJump Vim - GoToTypeDeclaration"/>
+      <keyboard-shortcut keymap="$default" first-keystroke="ctrl shift SEMICOLON"/>
-    <action id="AceVimAction_ShowIntentions"
+    </action>
-            class="org.acejump.action.AceVimAction$ShowIntentions"
+    <action id="AceLineStartsAction"
-            text="AceJump Vim - ShowIntentions"/>
+            class="org.acejump.action.AceKeyboardAction$StartAllLineStartsMode"
-    <action id="AceVimAction_ShowUsages"
+            text="Start AceJump in All Line Starts Mode"/>
-            class="org.acejump.action.AceVimAction$ShowUsages"
+    <action id="AceLineEndsAction"
-            text="AceJump Vim - ShowUsages"/>
+            class="org.acejump.action.AceKeyboardAction$StartAllLineEndsMode"
-    <action id="AceVimAction_FindUsages"
+            text="Start AceJump in All Line Ends Mode"/>
-            class="org.acejump.action.AceVimAction$FindUsages"
+    <action id="AceLineIndentsAction"
-            text="AceJump Vim - FindUsages"/>
+            class="org.acejump.action.AceKeyboardAction$StartAllLineIndentsMode"
-    <action id="AceVimAction_Refactor"
+            text="Start AceJump in All Line Indents Mode"/>
-            class="org.acejump.action.AceVimAction$Refactor"
+    <action id="AceWordAction"
-            text="AceJump Vim - Refactor"/>
+            class="org.acejump.action.AceKeyboardAction$StartAllWordsMode"
-    <action id="AceVimAction_Rename"
+            text="Start AceJump in All Words Mode"/>
-            class="org.acejump.action.AceVimAction$Rename"
+    <action id="AceWordForwardAction"
-            text="AceJump Vim - Rename"/>
+            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

@@ -1,4 +1,6 @@
-
+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
 
 /**
@@ -26,11 +28,91 @@ class AceTest : BaseTest() {
   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/org/acejump/test/util/BaseTest.kt

@@ -2,7 +2,6 @@ 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
@@ -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)
+    return myFixture.configureByText(PlainTextFileType.INSTANCE, contents)
-    (myFixture.editor as EditorImpl).scrollPane.viewport.setSize(1000, 100)
-    return file
   }
   
   fun resetEditor() {
@@ -55,7 +52,7 @@ abstract class BaseTest : BasePlatformTestCase() {
     UIUtil.dispatchAllInvocationEvents()
   }
   
-  private fun String.executeQuery(query: String) {
+  fun String.executeQuery(query: String) {
     myFixture.run {
       makeEditor(this@executeQuery)
       testAction(AceKeyboardAction.ActivateAceJump)