chylex/IntelliJ-Keyboard-Master
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-Keyboard-Master.git synced 2024-11-25 01:42:47 +01:00
Code

Compare commits

base: chylex:cd69968868c2fbb9775f359b19878162039eae85
Branches Tags
chylex:main
..
compare: chylex:401d5101e787075957c3b720a33f32ad664a40fb
Branches Tags
chylex:main

No commits in common. "cd69968868c2fbb9775f359b19878162039eae85" and "401d5101e787075957c3b720a33f32ad664a40fb" have entirely different histories.
cd69968868 ... 401d5101e7

3 changed files with 11 additions and 23 deletions
Show Stats Expand all files Collapse all files

2
build.gradle.kts
View File

@ -8,7 +8,7 @@ plugins {
} }
group = "com.chylex.intellij.keyboardmaster" group = "com.chylex.intellij.keyboardmaster"
version = "0.5.4" version = "0.5.3"
repositories { repositories {
mavenCentral() mavenCentral()

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

@ -17,7 +17,6 @@ import java.awt.Container
import java.awt.event.ActionEvent import java.awt.event.ActionEvent
import java.awt.event.ActionListener import java.awt.event.ActionListener
import java.awt.event.KeyEvent import java.awt.event.KeyEvent
import java.beans.PropertyChangeEvent
import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.atomic.AtomicBoolean
import javax.swing.JComponent import javax.swing.JComponent
import javax.swing.KeyStroke import javax.swing.KeyStroke
@ -61,26 +60,20 @@ internal open class VimNavigationDispatcher<T : JComponent>(final override val c
init { init {
registerCustomShortcutSet(KeyStrokeNode.getAllShortcuts(getAllKeyStrokes()), component, DISPOSABLE) registerCustomShortcutSet(KeyStrokeNode.getAllShortcuts(getAllKeyStrokes()), component, DISPOSABLE)
SpeedSearchSupply.getSupply(component, true)?.addChangeListener(::handleSpeedSearchChange)
val speedSearch = SpeedSearchSupply.getSupply(component, true)
speedSearch?.addChangeListener {
if (it.propertyName == SpeedSearchSupply.ENTERED_PREFIX_PROPERTY_NAME && !speedSearch.isPopupActive) {
isSearching.set(false)
currentNode = rootNode
}
}
} }
protected fun getAllKeyStrokes(): Set<KeyStroke> { protected fun getAllKeyStrokes(): Set<KeyStroke> {
return KeyStrokeNode.getAllKeyStrokes(rootNode, setOf(ENTER_KEY)) return KeyStrokeNode.getAllKeyStrokes(rootNode, setOf(ENTER_KEY))
} }
private fun handleSpeedSearchChange(e: PropertyChangeEvent) {
if (e.propertyName == SpeedSearchSupply.ENTERED_PREFIX_PROPERTY_NAME) {
val speedSearch = e.source as? SpeedSearchSupply ?: return
ApplicationManager.getApplication().invokeLater {
if (!speedSearch.isPopupActive) {
isSearching.set(false)
currentNode = rootNode
}
}
}
}
final override fun actionPerformed(e: AnActionEvent) { final override fun actionPerformed(e: AnActionEvent) {
val keyEvent = e.inputEvent as? KeyEvent ?: return val keyEvent = e.inputEvent as? KeyEvent ?: return

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

@ -85,7 +85,7 @@ internal object VimTreeNavigation {
val parentPath = path.parentPath ?: return val parentPath = path.parentPath ?: return
val parentRow = tree.getRowForPath(parentPath) val parentRow = tree.getRowForPath(parentPath)
selectRow(tree, parentRow + 1) tree.setSelectionRow(parentRow + 1)
} }
} }
@ -111,12 +111,7 @@ internal object VimTreeNavigation {
} }
} }
selectRow(tree, targetRow) tree.setSelectionRow(targetRow)
} }
} }
private fun selectRow(tree: JTree, row: Int) {
tree.setSelectionRow(row)
tree.scrollRowToVisible(row)
}
} }