Broken

build.gradle.kts

@@ -18,12 +18,12 @@ intellij {
   version.set("2024.2")
   updateSinceUntilBuild.set(false)
   
-  plugins.add("IdeaVIM:chylex-40")
+  // plugins.add("IdeaVIM:chylex-40")
-  plugins.add("com.intellij.classic.ui:242.20224.159")
+  // plugins.add("com.intellij.classic.ui:242.20224.159")
   
   pluginsRepositories {
-    custom("https://intellij.chylex.com")
+    // custom("https://intellij.chylex.com")
-    marketplace()
+    // marketplace()
   }
 }
 

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

@@ -1,6 +1,5 @@
 package org.acejump.action
 
-import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.application.ApplicationManager
@@ -168,10 +167,6 @@ sealed class AceVimAction : DumbAwareAction() {
       action.presentation.isEnabled = action.getData(CommonDataKeys.EDITOR) != null
     }
     
-    override fun getActionUpdateThread(): ActionUpdateThread {
-      return ActionUpdateThread.BGT
-    }
-    
     override fun actionPerformed(e: AnActionEvent) {
       val editor = e.getData(CommonDataKeys.EDITOR) ?: return
       val session = SessionManager.start(editor, AceVimMode.JumpAllEditors.getJumpEditors(editor))

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

@@ -13,6 +13,7 @@ class AceConfigurable : Configurable {
   
   override fun isModified() =
     panel.allowedChars != settings.allowedChars ||
+      panel.prefixChars != settings.prefixChars ||
       panel.keyboardLayout != settings.layout ||
       panel.minQueryLengthInt != settings.minQueryLength ||
       panel.editorFadeOpacityPercent != settings.editorFadeOpacity ||
@@ -23,6 +24,7 @@ class AceConfigurable : Configurable {
   
   override fun apply() {
     settings.allowedChars = panel.allowedChars
+    settings.prefixChars = panel.prefixChars
     settings.layout = panel.keyboardLayout
     settings.minQueryLength = panel.minQueryLengthInt ?: settings.minQueryLength
     settings.editorFadeOpacity = panel.editorFadeOpacityPercent

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

@@ -8,6 +8,7 @@ import java.awt.Color
 data class AceSettings(
   var layout: KeyLayout = QWERTY,
   var allowedChars: String = layout.allChars,
+  var prefixChars: String = ";",
   var minQueryLength: Int = 1,
   var editorFadeOpacity: Int = 70,
   

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

@@ -5,15 +5,16 @@ import com.intellij.ui.ColorPanel
 import com.intellij.ui.components.JBSlider
 import com.intellij.ui.components.JBTextArea
 import com.intellij.ui.components.JBTextField
-import com.intellij.ui.dsl.builder.COLUMNS_LARGE
+import com.intellij.ui.layout.Cell
-import com.intellij.ui.dsl.builder.COLUMNS_SHORT
+import com.intellij.ui.layout.GrowPolicy.MEDIUM_TEXT
-import com.intellij.ui.dsl.builder.columns
+import com.intellij.ui.layout.GrowPolicy.SHORT_TEXT
-import com.intellij.ui.dsl.builder.panel
+import com.intellij.ui.layout.panel
 import org.acejump.input.KeyLayout
 import java.awt.Color
 import java.awt.Font
 import java.util.Hashtable
 import javax.swing.JCheckBox
+import javax.swing.JComponent
 import javax.swing.JLabel
 import javax.swing.JPanel
 import javax.swing.JSlider
@@ -26,6 +27,7 @@ import kotlin.reflect.KProperty
 @Suppress("UsePropertyAccessSyntax")
 internal class AceSettingsPanel {
   private val tagAllowedCharsField = JBTextField()
+  private val tagPrefixCharsField = JBTextField()
   private val keyboardLayoutCombo = ComboBox<KeyLayout>()
   private val keyboardLayoutArea = JBTextArea().apply { isEditable = false }
   private val minQueryLengthField = JBTextField()
@@ -44,40 +46,52 @@ internal class AceSettingsPanel {
   
   init {
     tagAllowedCharsField.apply { font = Font("monospaced", font.style, font.size) }
+    tagPrefixCharsField.apply { font = Font("monospaced", font.style, font.size) }
     keyboardLayoutArea.apply { font = Font("monospaced", font.style, font.size) }
     keyboardLayoutCombo.setupEnumItems { keyChars = it.rows.joinToString("\n") }
   }
   
   internal val rootPanel: JPanel = panel {
-    group("Characters and Layout") {
+    fun Cell.short(component: JComponent) = component(growPolicy = SHORT_TEXT)
-      row("Allowed characters in tags:") { cell(tagAllowedCharsField).columns(COLUMNS_LARGE) }
+    fun Cell.medium(component: JComponent) = component(growPolicy = MEDIUM_TEXT)
-      row("Keyboard layout:") { cell(keyboardLayoutCombo).columns(COLUMNS_SHORT) }
+    
-      row("Keyboard design:") { cell(keyboardLayoutArea).columns(COLUMNS_SHORT) }
+    titledRow("Characters and Layout") {
+      row("Allowed characters in tags:") { medium(tagAllowedCharsField) }
+      row("Allowed prefix characters in tags:") { medium(tagPrefixCharsField) }
+      row("Keyboard layout:") { short(keyboardLayoutCombo) }
+      row("Keyboard design:") { short(keyboardLayoutArea) }
     }
     
-    group("Behavior") {
+    titledRow("Behavior") {
-      row("Minimum typed characters (1-10):") { cell(minQueryLengthField).columns(COLUMNS_SHORT) }
+      row("Minimum typed characters (1-10):") { short(minQueryLengthField) }
     }
     
-    group("Colors") {
+    titledRow("Colors") {
       row("Caret background:") {
-        cell(jumpModeColorWheel)
+        cell {
+          component(jumpModeColorWheel)
+        }
       }
       row("Tag foreground:") {
-        cell(tagForeground1ColorWheel)
+        cell {
-        cell(tagForeground2ColorWheel)
+          component(tagForeground1ColorWheel)
+          component(tagForeground2ColorWheel)
+        }
       }
       row("Search highlight:") {
-        cell(searchHighlightColorWheel)
+        cell {
+          component(searchHighlightColorWheel)
+        }
       }
       row("Editor fade opacity (%):") {
-        cell(editorFadeOpacitySlider)
+        medium(editorFadeOpacitySlider)
       }
     }
   }
   
   // Property-to-property delegation: https://stackoverflow.com/q/45074596/1772342
   internal var allowedChars by tagAllowedCharsField
+  internal var prefixChars by tagPrefixCharsField
   internal var keyboardLayout by keyboardLayoutCombo
   internal var keyChars by keyboardLayoutArea
   internal var minQueryLength by minQueryLengthField
@@ -97,6 +111,7 @@ internal class AceSettingsPanel {
   
   fun reset(settings: AceSettings) {
     allowedChars = settings.allowedChars
+    prefixChars = settings.prefixChars
     keyboardLayout = settings.layout
     minQueryLength = settings.minQueryLength.toString()
     editorFadeOpacityPercent = settings.editorFadeOpacity
@@ -108,7 +123,7 @@ internal class AceSettingsPanel {
   
   // Removal pending support for https://youtrack.jetbrains.com/issue/KT-8575
   
-  private operator fun JTextComponent.getValue(a: AceSettingsPanel, p: KProperty<*>) = text.lowercase()
+  private operator fun JTextComponent.getValue(a: AceSettingsPanel, p: KProperty<*>) = text.toLowerCase()
   private operator fun JTextComponent.setValue(a: AceSettingsPanel, p: KProperty<*>, s: String) = setText(s)
   
   private operator fun ColorPanel.getValue(a: AceSettingsPanel, p: KProperty<*>) = selectedColor

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

@@ -5,22 +5,13 @@ package org.acejump.input
  * ergonomically difficult they are to press.
  */
 @Suppress("unused", "SpellCheckingInspection")
-enum class KeyLayout(
+enum class KeyLayout(internal val rows: Array<String>, priority: String, internal val characterRemapping: Map<Char, Char> = emptyMap()) {
-  internal val rows: Array<String>,
-  priority: String,
-  private val characterSides: Pair<Set<Char>, Set<Char>> = Pair(emptySet(), emptySet()),
-  internal val characterRemapping: Map<Char, Char> = emptyMap(),
-) {
   COLEMK(arrayOf("1234567890", "qwfpgjluy", "arstdhneio", "zxcvbkm"), priority = "tndhseriaovkcmbxzgjplfuwyq5849673210"),
   WORKMN(arrayOf("1234567890", "qdrwbjfup", "ashtgyneoi", "zxmcvkl"), priority = "tnhegysoaiclvkmxzwfrubjdpq5849673210"),
   DVORAK(arrayOf("1234567890", "pyfgcrl", "aoeuidhtns", "qjkxbmwvz"), priority = "uhetidonasxkbjmqwvzgfycprl5849673210"),
   QWERTY(arrayOf("1234567890", "qwertyuiop", "asdfghjkl", "zxcvbnm"), priority = "fjghdkslavncmbxzrutyeiwoqp5849673210"),
   QWERTZ(arrayOf("1234567890", "qwertzuiop", "asdfghjkl", "yxcvbnm"), priority = "fjghdkslavncmbxyrutzeiwoqp5849673210"),
-  QWERTZ_CZ(
+  QWERTZ_CZ(arrayOf("1234567890", "qwertzuiop", "asdfghjkl", "yxcvbnm"), priority = "fjghdkslavncmbxyrutzeiwoqp5849673210", characterRemapping =  mapOf(
-    arrayOf("1234567890", "qwertzuiop", "asdfghjkl", "yxcvbnm"),
-    priority = "fjghdkslavncmbxyrutzeiwoqp5849673210",
-    characterSides = sides("", ""),
-    characterRemapping = mapOf(
     '+' to '1',
     'ě' to '2',
     'š' to '3',
@@ -31,20 +22,15 @@ enum class KeyLayout(
     'á' to '8',
     'í' to '9',
     'é' to '0'
-    )
+  )),
-  ),
   QGMLWY(arrayOf("1234567890", "qgmlwyfub", "dstnriaeoh", "zxcvjkp"), priority = "naterisodhvkcpjxzlfmuwygbq5849673210"),
   QGMLWB(arrayOf("1234567890", "qgmlwbyuv", "dstnriaeoh", "zxcfjkp"), priority = "naterisodhfkcpjxzlymuwbgvq5849673210"),
   NORMAN(arrayOf("1234567890", "qwdfkjurl", "asetgynioh", "zxcvbpm"), priority = "tneigysoahbvpcmxzjkufrdlwq5849673210");
   
   internal val allChars = rows.joinToString("").toCharArray().apply(CharArray::sort).joinToString("")
-  private val allPriorities = priority.mapIndexed { index, char -> char to index }.toMap()
+  internal val allPriorities = priority.mapIndexed { index, char -> char to index }.toMap()
   
-  internal fun priority(): (Char) -> Int {
+  internal inline fun priority(crossinline tagToChar: (String) -> Char): (String) -> Int {
-    return { allPriorities.getOrDefault(it, Int.MAX_VALUE) }
+    return { allPriorities.getOrDefault(tagToChar(it), Int.MAX_VALUE) }
   }
 }
-
-private fun sides(left: String, right: String): Pair<Set<Char>, Set<Char>> {
-  return Pair(left.toCharArray().toSet(), right.toCharArray().toSet())
-}

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

@@ -7,14 +7,17 @@ import org.acejump.config.AceSettings
  * with repeated keys (ex. FF, JJ) or adjacent keys (ex. GH, UJ).
  */
 internal object KeyLayoutCache {
-  lateinit var allowedCharsSorted: List<Char>
+  /**
+   * Returns all possible two key tags, pre-sorted according to [tagOrder].
+   */
+  lateinit var allPossibleTagsLowercase: List<String>
     private set
   
   /**
    * Called before any lazily initialized properties are used, to ensure that they are initialized even if the settings are missing.
    */
   fun ensureInitialized(settings: AceSettings) {
-    if (!::allowedCharsSorted.isInitialized) {
+    if (!::allPossibleTagsLowercase.isInitialized) {
       reset(settings)
     }
   }
@@ -23,17 +26,22 @@ internal object KeyLayoutCache {
    * Re-initializes cached data according to updated settings.
    */
   fun reset(settings: AceSettings) {
-    val allowedCharList = processCharList(settings.allowedChars)
+    @Suppress("ConvertLambdaToReference")
+    val allSuffixChars = processCharList(settings.allowedChars).ifEmpty { processCharList(settings.layout.allChars).toList() }
+    val allPrefixChars = processCharList(settings.prefixChars).filterNot(allSuffixChars::contains).plus("")
     
-    allowedCharsSorted = if (allowedCharList.isEmpty()) {
+    val tagOrder = compareBy(
-      processCharList(settings.layout.allChars)
+      String::length,
-    }
+      { if (it.length == 1) Int.MIN_VALUE else allPrefixChars.indexOf(it.first().toString()) },
-    else {
+      settings.layout.priority(String::last)
-      allowedCharList.sortedWith(compareBy(settings.layout.priority()))
+    )
-    }
+    
+    allPossibleTagsLowercase = allSuffixChars
+      .flatMap { suffix -> allPrefixChars.map { prefix -> "$prefix$suffix" } }
+      .sortedWith(tagOrder)
   }
   
-  private fun processCharList(charList: String): List<Char> {
+  private fun processCharList(charList: String): Set<String> {
-    return charList.toCharArray().map(Char::lowercaseChar).distinct()
+    return charList.toCharArray().map(Char::lowercase).toSet()
   }
 }

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

@@ -28,13 +28,13 @@ internal sealed class SearchQuery {
    * If the first character of the query is lowercase, then the entire query will be case-insensitive,
    * and only beginnings of words and camel humps will be matched.
    */
-  class Literal(override val rawText: String) : SearchQuery() {
+  class Literal(override val rawText: String, val excludeMiddlesOfWords: Boolean) : SearchQuery() {
     init {
       require(rawText.isNotEmpty())
     }
     
     override fun refine(char: Char): SearchQuery {
-      return Literal(rawText + char)
+      return Literal(rawText + char, excludeMiddlesOfWords)
     }
     
     override fun getHighlightLength(text: CharSequence, offset: Int): Int {
@@ -44,14 +44,19 @@ internal sealed class SearchQuery {
     override fun toRegex(): Regex {
       val firstChar = rawText.first()
       val pattern = if (firstChar.isLowerCase()) {
+        if (excludeMiddlesOfWords) {
+          val firstCharUppercasePattern = Regex.escape(firstChar.uppercaseChar().toString())
+          val firstCharPattern = Regex.escape(firstChar.toString())
+          val remainingPattern = if (rawText.length > 1) Regex.escape(rawText.drop(1)) else ""
+          "(?:$firstCharUppercasePattern|(?<![a-zA-Z])$firstCharPattern)$remainingPattern"
+        }
+        else {
           val fullPattern = Regex.escape(rawText)
           "(?i)$fullPattern"
         }
+      }
       else {
-        val firstCharUppercasePattern = Regex.escape(firstChar.toString())
+        Regex.escape(rawText)
-        val firstCharLowercasePattern = Regex.escape(firstChar.lowercase())
-        val remainingPattern = if (rawText.length > 1) Regex.escape(rawText.drop(1)) else ""
-        "(?:$firstCharUppercasePattern|(?<![a-zA-Z])$firstCharLowercasePattern)$remainingPattern"
       }
       
       return Regex(pattern, setOf(RegexOption.MULTILINE))
@@ -65,7 +70,7 @@ internal sealed class SearchQuery {
     override val rawText = ""
     
     override fun refine(char: Char): SearchQuery {
-      return Literal(char.toString())
+      return Literal(char.toString(), excludeMiddlesOfWords = false)
     }
     
     override fun getHighlightLength(text: CharSequence, offset: Int): Int {

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

@@ -40,7 +40,7 @@ class Tagger(private val editors: List<Editor>, results: Map<Editor, IntList>) {
       .flatMap { (editor, sites) -> sites.map { site -> Tag(editor, site) } }
       .sortedWith(siteOrder(editors, caches))
     
-    tagMap = generateTags(tagSites).zip(tagSites).toMap()
+    tagMap = KeyLayoutCache.allPossibleTagsLowercase.zip(tagSites).toMap()
   }
   
   internal fun type(char: Char): TaggingResult {
@@ -61,35 +61,6 @@ class Tagger(private val editors: List<Editor>, results: Map<Editor, IntList>) {
   }
   
   private companion object {
-    private fun generateTags(tagSites: List<Tag>): List<String> {
-      val allowedChars = KeyLayoutCache.allowedCharsSorted
-      
-      val tags = mutableListOf<String>()
-      var remainingTagCount = tagSites.size
-      
-      outer@ for (i in allowedChars.indices) {
-        val c1 = allowedChars[i]
-        
-        if (remainingTagCount <= allowedChars.size - i) {
-          tags.add(c1.toString())
-          if (--remainingTagCount <= 0) {
-            break@outer
-          }
-        }
-        else {
-          for (c2 in allowedChars) {
-            tags.add("$c1$c2")
-            
-            if (--remainingTagCount <= 0) {
-              break@outer
-            }
-          }
-        }
-      }
-      
-      return tags
-    }
-    
     private fun sortResults(results: Map<Editor, IntList>, caches: Map<Editor, EditorOffsetCache>) {
       for ((editor, offsets) in results) {
         val cache = caches.getValue(editor)

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

@@ -2,7 +2,6 @@ package org.acejump.session
 
 import com.intellij.openapi.editor.Editor
 import org.acejump.boundaries.Boundaries
-import org.acejump.boundaries.StandardBoundaries
 import org.acejump.config.AceConfig
 import org.acejump.search.SearchProcessor
 import org.acejump.search.SearchQuery
@@ -18,7 +17,7 @@ sealed interface SessionState {
     private val defaultBoundary: Boundaries,
   ) : SessionState {
     override fun type(char: Char): TypeResult {
-      val searchProcessor = SearchProcessor(jumpEditors, SearchQuery.Literal(char.toString()), defaultBoundary)
+      val searchProcessor = SearchProcessor(jumpEditors, SearchQuery.Literal(char.toString(), excludeMiddlesOfWords = true), defaultBoundary)
       
       return if (searchProcessor.isQueryFinished) {
         TypeResult.ChangeState(SelectTag(actions, jumpEditors, searchProcessor))
@@ -64,15 +63,9 @@ sealed interface SessionState {
     override fun type(char: Char): TypeResult {
       if (char == ' ') {
         val query = searchProcessor.query
-        if (query is SearchQuery.Literal) {
+        if (query is SearchQuery.Literal && query.excludeMiddlesOfWords) {
-          val newBoundaries = when (searchProcessor.boundaries) {
+          val newQuery = SearchQuery.Literal(query.rawText, excludeMiddlesOfWords = false)
-            StandardBoundaries.VISIBLE_ON_SCREEN -> StandardBoundaries.AFTER_CARET
+          val newSearchProcessor = SearchProcessor(jumpEditors, newQuery, searchProcessor.boundaries)
-            StandardBoundaries.AFTER_CARET       -> StandardBoundaries.BEFORE_CARET
-            StandardBoundaries.BEFORE_CARET      -> StandardBoundaries.VISIBLE_ON_SCREEN
-            else                                 -> searchProcessor.boundaries
-          }
-          
-          val newSearchProcessor = SearchProcessor(jumpEditors, query, newBoundaries)
           return TypeResult.ChangeState(SelectTag(actions, jumpEditors, newSearchProcessor))
         }
       }