build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "org.acejump"
-version = "chylex-18"
+version = "chylex-16"
 
 repositories {
   mavenCentral()

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

@@ -7,6 +7,8 @@ import com.intellij.openapi.project.Project
 import com.intellij.util.IncorrectOperationException
 import it.unimi.dsi.fastutil.ints.IntArrayList
 
+annotation class ExternalUsage
+
 /**
  * Returns an immutable version of the currently edited document.
  */
@@ -50,6 +52,57 @@ fun CharSequence.countMatchingCharacters(selfOffset: Int, otherText: String): In
   return i
 }
 
+/**
+ * Determines which characters form a "word" for the purposes of functions below.
+ */
+val Char.isWordPart
+  get() = this in 'a'..'z' || this.isJavaIdentifierPart()
+
+/**
+ * Finds index of the first character in a word.
+ */
+inline fun CharSequence.wordStart(pos: Int, isPartOfWord: (Char) -> Boolean = Char::isWordPart): Int {
+  var start = pos
+  
+  while (start > 0 && isPartOfWord(this[start - 1])) {
+    --start
+  }
+  
+  return start
+}
+
+/**
+ * Finds index of the last character in a word.
+ */
+inline fun CharSequence.wordEnd(pos: Int, isPartOfWord: (Char) -> Boolean = Char::isWordPart): Int {
+  var end = pos
+  val limit = length - 1
+  
+  while (end < limit && isPartOfWord(this[end + 1])) {
+    ++end
+  }
+  
+  return end
+}
+
+/**
+ * Finds index of the first word character following a sequence of non-word characters following the end of a word.
+ */
+inline fun CharSequence.wordEndPlus(pos: Int, isPartOfWord: (Char) -> Boolean = Char::isWordPart): Int {
+  var end = this.wordEnd(pos, isPartOfWord)
+  val limit = length - 1
+  
+  while (end < limit && !isPartOfWord(this[end + 1])) {
+    ++end
+  }
+  
+  if (end < limit && isPartOfWord(this[end + 1])) {
+    ++end
+  }
+  
+  return end
+}
+
 fun MutableMap<Editor, IntArrayList>.clone(): MutableMap<Editor, IntArrayList> {
   val clone = HashMap<Editor, IntArrayList>(size)
   

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

@@ -20,7 +20,6 @@ class AceConfig : PersistentStateComponent<AceSettings> {
     
     val layout get() = settings.layout
     val minQueryLength get() = settings.minQueryLength
-    val editorFadeOpacity get() = settings.editorFadeOpacity
     val jumpModeColor get() = settings.jumpModeColor
     val tagForegroundColor1 get() = settings.tagForegroundColor1
     val tagForegroundColor2 get() = settings.tagForegroundColor2

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

@@ -16,7 +16,6 @@ class AceConfigurable : Configurable {
       panel.prefixChars != settings.prefixChars ||
       panel.keyboardLayout != settings.layout ||
       panel.minQueryLengthInt != settings.minQueryLength ||
-      panel.editorFadeOpacityPercent != settings.editorFadeOpacity ||
       panel.jumpModeColor != settings.jumpModeColor ||
       panel.tagForegroundColor1 != settings.tagForegroundColor1 ||
       panel.tagForegroundColor2 != settings.tagForegroundColor2 ||
@@ -27,7 +26,6 @@ class AceConfigurable : Configurable {
     settings.prefixChars = panel.prefixChars
     settings.layout = panel.keyboardLayout
     settings.minQueryLength = panel.minQueryLengthInt ?: settings.minQueryLength
-    settings.editorFadeOpacity = panel.editorFadeOpacityPercent
     panel.jumpModeColor?.let { settings.jumpModeColor = it }
     panel.tagForegroundColor1?.let { settings.tagForegroundColor1 = it }
     panel.tagForegroundColor2?.let { settings.tagForegroundColor2 = it }

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

@@ -10,7 +10,6 @@ data class AceSettings(
   var allowedChars: String = layout.allChars,
   var prefixChars: String = ";",
   var minQueryLength: Int = 1,
-  var editorFadeOpacity: Int = 70,
   
   @OptionTag("jumpModeRGB", converter = ColorConverter::class)
   var jumpModeColor: Color = Color(0xFFFFFF),

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

@@ -2,7 +2,6 @@ package org.acejump.config
 
 import com.intellij.openapi.ui.ComboBox
 import com.intellij.ui.ColorPanel
-import com.intellij.ui.components.JBSlider
 import com.intellij.ui.components.JBTextArea
 import com.intellij.ui.components.JBTextField
 import com.intellij.ui.layout.Cell
@@ -12,12 +11,9 @@ 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
 import javax.swing.text.JTextComponent
 import kotlin.reflect.KProperty
 
@@ -31,14 +27,6 @@ internal class AceSettingsPanel {
   private val keyboardLayoutCombo = ComboBox<KeyLayout>()
   private val keyboardLayoutArea = JBTextArea().apply { isEditable = false }
   private val minQueryLengthField = JBTextField()
-  private val editorFadeOpacitySlider = JBSlider(0, 10).apply {
-    labelTable = Hashtable((0..10).associateWith { JLabel("${it * 10}") })
-    paintTrack = true
-    paintLabels = true
-    paintTicks = true
-    minorTickSpacing = 1
-    majorTickSpacing = 1
-  }
   private val jumpModeColorWheel = ColorPanel()
   private val tagForeground1ColorWheel = ColorPanel()
   private val tagForeground2ColorWheel = ColorPanel()
@@ -83,9 +71,6 @@ internal class AceSettingsPanel {
           component(searchHighlightColorWheel)
         }
       }
-      row("Editor fade opacity (%):") {
-        medium(editorFadeOpacitySlider)
-      }
     }
   }
   
@@ -95,7 +80,6 @@ internal class AceSettingsPanel {
   internal var keyboardLayout by keyboardLayoutCombo
   internal var keyChars by keyboardLayoutArea
   internal var minQueryLength by minQueryLengthField
-  internal var editorFadeOpacity by editorFadeOpacitySlider
   internal var jumpModeColor by jumpModeColorWheel
   internal var tagForegroundColor1 by tagForeground1ColorWheel
   internal var tagForegroundColor2 by tagForeground2ColorWheel
@@ -105,16 +89,11 @@ internal class AceSettingsPanel {
     get() = minQueryLength.toIntOrNull()?.coerceIn(1, 10)
     set(value) { minQueryLength = value.toString() }
   
-  internal var editorFadeOpacityPercent
-    get() = editorFadeOpacity * 10
-    set(value) { editorFadeOpacity = value / 10 }
-  
   fun reset(settings: AceSettings) {
     allowedChars = settings.allowedChars
     prefixChars = settings.prefixChars
     keyboardLayout = settings.layout
     minQueryLength = settings.minQueryLength.toString()
-    editorFadeOpacityPercent = settings.editorFadeOpacity
     jumpModeColor = settings.jumpModeColor
     tagForegroundColor1 = settings.tagForegroundColor1
     tagForegroundColor2 = settings.tagForegroundColor2
@@ -132,9 +111,6 @@ internal class AceSettingsPanel {
   private operator fun JCheckBox.getValue(a: AceSettingsPanel, p: KProperty<*>) = isSelected
   private operator fun JCheckBox.setValue(a: AceSettingsPanel, p: KProperty<*>, selected: Boolean) = setSelected(selected)
   
-  private operator fun JSlider.getValue(a: AceSettingsPanel, p: KProperty<*>) = value
-  private operator fun JSlider.setValue(a: AceSettingsPanel, p: KProperty<*>, value: Int) = setValue(value)
-  
   private operator fun <T> ComboBox<T>.getValue(a: AceSettingsPanel, p: KProperty<*>) = selectedItem as T
   private operator fun <T> ComboBox<T>.setValue(a: AceSettingsPanel, p: KProperty<*>, item: T) = setSelectedItem(item)
   

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

@@ -4,25 +4,13 @@ package org.acejump.input
  * Defines common keyboard layouts. Each layout has a key priority order, based on each key's distance from the home row and how
  * ergonomically difficult they are to press.
  */
-@Suppress("unused", "SpellCheckingInspection")
-enum class KeyLayout(internal val rows: Array<String>, priority: String, internal val characterRemapping: Map<Char, Char> = emptyMap()) {
+@Suppress("unused")
+enum class KeyLayout(internal val rows: Array<String>, priority: String) {
   COLEMK(arrayOf("1234567890", "qwfpgjluy", "arstdhneio", "zxcvbkm"), priority = "tndhseriaovkcmbxzgjplfuwyq5849673210"),
   WORKMN(arrayOf("1234567890", "qdrwbjfup", "ashtgyneoi", "zxmcvkl"), priority = "tnhegysoaiclvkmxzwfrubjdpq5849673210"),
   DVORAK(arrayOf("1234567890", "pyfgcrl", "aoeuidhtns", "qjkxbmwvz"), priority = "uhetidonasxkbjmqwvzgfycprl5849673210"),
   QWERTY(arrayOf("1234567890", "qwertyuiop", "asdfghjkl", "zxcvbnm"), priority = "fjghdkslavncmbxzrutyeiwoqp5849673210"),
   QWERTZ(arrayOf("1234567890", "qwertzuiop", "asdfghjkl", "yxcvbnm"), priority = "fjghdkslavncmbxyrutzeiwoqp5849673210"),
-  QWERTZ_CZ(arrayOf("1234567890", "qwertzuiop", "asdfghjkl", "yxcvbnm"), priority = "fjghdkslavncmbxyrutzeiwoqp5849673210", characterRemapping =  mapOf(
-    '+' to '1',
-    'ě' to '2',
-    'š' to '3',
-    'č' to '4',
-    'ř' to '5',
-    'ž' to '6',
-    'ý' to '7',
-    'á' to '8',
-    'í' to '9',
-    'é' to '0'
-  )),
   QGMLWY(arrayOf("1234567890", "qgmlwyfub", "dstnriaeoh", "zxcvjkp"), priority = "naterisodhvkcpjxzlfmuwygbq5849673210"),
   QGMLWB(arrayOf("1234567890", "qgmlwbyuv", "dstnriaeoh", "zxcfjkp"), priority = "naterisodhfkcpjxzlymuwbgvq5849673210"),
   NORMAN(arrayOf("1234567890", "qwdfkjurl", "asetgynioh", "zxcvbpm"), priority = "tneigysoahbvpcmxzjkufrdlwq5849673210");

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

@@ -7,6 +7,13 @@ import org.acejump.config.AceSettings
  * with repeated keys (ex. FF, JJ) or adjacent keys (ex. GH, UJ).
  */
 internal object KeyLayoutCache {
+  /**
+   * Sorts tags according to current keyboard layout settings, and some predefined rules that force tags with digits, and tags with two
+   * keys far apart, to be sorted after other (easier to type) tags.
+   */
+  lateinit var tagOrder: Comparator<String>
+    private set
+  
   /**
    * Returns all possible two key tags, pre-sorted according to [tagOrder].
    */
@@ -17,7 +24,7 @@ internal object KeyLayoutCache {
    * 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 (!::allPossibleTagsLowercase.isInitialized) {
+    if (!::tagOrder.isInitialized) {
       reset(settings)
     }
   }
@@ -26,16 +33,15 @@ internal object KeyLayoutCache {
    * Re-initializes cached data according to updated settings.
    */
   fun reset(settings: AceSettings) {
+    tagOrder = compareBy(
+      String::length,
+      settings.layout.priority(String::last)
+    )
+    
     @Suppress("ConvertLambdaToReference")
     val allSuffixChars = processCharList(settings.allowedChars).ifEmpty { processCharList(settings.layout.allChars).toList() }
     val allPrefixChars = processCharList(settings.prefixChars).filterNot(allSuffixChars::contains).plus("")
     
-    val tagOrder = compareBy(
-      String::length,
-      { if (it.length == 1) Int.MIN_VALUE else allPrefixChars.indexOf(it.first().toString()) },
-      settings.layout.priority(String::last)
-    )
-    
     allPossibleTagsLowercase = allSuffixChars
       .flatMap { suffix -> allPrefixChars.map { prefix -> "$prefix$suffix" } }
       .sortedWith(tagOrder)

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

@@ -39,7 +39,7 @@ class SearchProcessor private constructor(query: SearchQuery, private val result
           if (highlightEnd > offsetRange.last) {
             break
           }
-          else if (boundaries.isOffsetInside(editor, index) && !editor.foldingModel.isOffsetCollapsed(index)) {
+          else if (boundaries.isOffsetInside(editor, index)) {
             offsets.add(index)
           }
           

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

@@ -5,10 +5,13 @@ import com.intellij.openapi.editor.Editor
 import it.unimi.dsi.fastutil.ints.IntList
 import org.acejump.boundaries.EditorOffsetCache
 import org.acejump.boundaries.StandardBoundaries.VISIBLE_ON_SCREEN
+import org.acejump.immutableText
 import org.acejump.input.KeyLayoutCache
+import org.acejump.isWordPart
 import org.acejump.view.TagMarker
 import kotlin.collections.component1
 import kotlin.collections.component2
+import kotlin.math.max
 import kotlin.math.min
 
 /**
@@ -89,24 +92,26 @@ class Tagger(private val editors: List<Editor>, results: Map<Editor, IntList>) {
         return@Comparator if (aEditorIndex < bEditorIndex) -1 else 1
       }
       
-      val aCaches = caches.getValue(aEditor)
-      val bCaches = caches.getValue(bEditor)
-      
-      val aIsVisible = VISIBLE_ON_SCREEN.isOffsetInside(aEditor, a.offset, aCaches)
-      val bIsVisible = VISIBLE_ON_SCREEN.isOffsetInside(bEditor, b.offset, bCaches)
+      val aIsVisible = VISIBLE_ON_SCREEN.isOffsetInside(aEditor, a.offset, caches.getValue(aEditor))
+      val bIsVisible = 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
       }
       
-      val aPosition = aCaches.offsetToXY(aEditor, a.offset)
-      val bPosition = bCaches.offsetToXY(bEditor, b.offset)
+      val aIsNotWordStart = aEditor.immutableText[max(0, a.offset - 1)].isWordPart
+      val bIsNotWordStart = bEditor.immutableText[max(0, b.offset - 1)].isWordPart
+      if (aIsNotWordStart != bIsNotWordStart) {
+        // Ensure that the first letter of a word is prioritized for tagging.
+        return@Comparator if (bIsNotWordStart) -1 else 1
+      }
       
-      val caretPosition = editorPriority[0].offsetToXY(editorPriority[0].caretModel.offset)
-      val aDistance = aPosition.distanceSq(caretPosition)
-      val bDistance = bPosition.distanceSq(caretPosition)
-      
-      return@Comparator aDistance.compareTo(bDistance)
+      when {
+        a.offset < b.offset -> -1
+        a.offset > b.offset -> 1
+        else                -> 0
+      }
     }
+    
   }
 }

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

@@ -75,7 +75,7 @@ class Session(private val mainEditor: Editor, private val jumpEditors: List<Edit
     val state = state ?: return
     
     editorSettings.startEditing(editor)
-    val result = mode.type(state, AceConfig.layout.characterRemapping.getOrDefault(charTyped, charTyped), acceptedTag)
+    val result = mode.type(state, charTyped, acceptedTag)
     editorSettings.stopEditing(editor)
     
     when (result) {

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

@@ -5,7 +5,6 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.ui.ColorUtil
 import org.acejump.boundaries.EditorOffsetCache
 import org.acejump.boundaries.StandardBoundaries
-import org.acejump.config.AceConfig
 import java.awt.Graphics
 import java.awt.Graphics2D
 import java.awt.Rectangle
@@ -54,7 +53,7 @@ internal class TagCanvas(private val editor: Editor) : JComponent() {
       return
     }
     
-    g.color = ColorUtil.withAlpha(editor.colorsScheme.defaultBackground, (AceConfig.editorFadeOpacity * 0.01).coerceIn(0.0, 1.0))
+    g.color = ColorUtil.withAlpha(editor.colorsScheme.defaultBackground, 0.6)
     g.fillRect(0, 0, width - 1, height - 1)
     
     if (markers.isEmpty()) {