chylex/IntelliJ-AceJump
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-AceJump.git synced 2025-05-02 11:34:07 +02:00
Code

Update for IDEA 2024.2

Browse Source
This commit is contained in:
chylex 2024-09-03 00:32:18 +02:00
parent 59fbd4e19c
commit a3a86cf447
Signed by: chylex
GPG Key ID: 4DE42C8F19A80548
3 changed files with 29 additions and 31 deletions
build.gradle.kts
src/main/kotlin/org/acejump
action
AceVimAction.kt
config
AceSettingsPanel.kt

9
build.gradle.kts
View File

@ -15,12 +15,15 @@ repositories {
}
intellij {
version.set("2024.1.4")
version.set("2024.2")
updateSinceUntilBuild.set(false)
plugins.add("IdeaVIM:chylex-37")
plugins.add("IdeaVIM:chylex-40")
plugins.add("com.intellij.classic.ui:242.20224.159")
pluginsRepositories {
custom("https://intellij.chylex.com")
marketplace()
}
}
@ -33,7 +36,7 @@ dependencies {
}
tasks.patchPluginXml {
sinceBuild.set("241")
sinceBuild.set("242")
}
tasks.buildSearchableOptions {

5
src/main/kotlin/org/acejump/action/AceVimAction.kt
View File

@ -1,5 +1,6 @@
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
@ -167,6 +168,10 @@ 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))

46
src/main/kotlin/org/acejump/config/AceSettingsPanel.kt
View File

@ -5,16 +5,15 @@ 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
import com.intellij.ui.layout.GrowPolicy.MEDIUM_TEXT
import com.intellij.ui.layout.GrowPolicy.SHORT_TEXT
import com.intellij.ui.layout.panel
import com.intellij.ui.dsl.builder.COLUMNS_LARGE
import com.intellij.ui.dsl.builder.COLUMNS_SHORT
import com.intellij.ui.dsl.builder.columns
import com.intellij.ui.dsl.builder.panel
import 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
@ -52,39 +51,30 @@ internal class AceSettingsPanel {
}
internal val rootPanel: JPanel = panel {
fun Cell.short(component: JComponent) = component(growPolicy = SHORT_TEXT)
fun Cell.medium(component: JComponent) = component(growPolicy = MEDIUM_TEXT)
titledRow("Characters and Layout") {
row("Allowed characters in tags:") { medium(tagAllowedCharsField) }
row("Allowed prefix characters in tags:") { medium(tagPrefixCharsField) }
row("Keyboard layout:") { short(keyboardLayoutCombo) }
row("Keyboard design:") { short(keyboardLayoutArea) }
group("Characters and Layout") {
row("Allowed characters in tags:") { cell(tagAllowedCharsField).columns(COLUMNS_LARGE) }
row("Allowed prefix characters in tags:") { cell(tagPrefixCharsField).columns(COLUMNS_MEDIUM) }
row("Keyboard layout:") { cell(keyboardLayoutCombo).columns(COLUMNS_SHORT) }
row("Keyboard design:") { cell(keyboardLayoutArea).columns(COLUMNS_SHORT) }
}
titledRow("Behavior") {
row("Minimum typed characters (1-10):") { short(minQueryLengthField) }
group("Behavior") {
row("Minimum typed characters (1-10):") { cell(minQueryLengthField).columns(COLUMNS_SHORT) }
}
titledRow("Colors") {
group("Colors") {
row("Caret background:") {
cell {
component(jumpModeColorWheel)
}
cell(jumpModeColorWheel)
}
row("Tag foreground:") {
cell {
component(tagForeground1ColorWheel)
component(tagForeground2ColorWheel)
}
cell(tagForeground1ColorWheel)
cell(tagForeground2ColorWheel)
}
row("Search highlight:") {
cell {
component(searchHighlightColorWheel)
}
cell(searchHighlightColorWheel)
}
row("Editor fade opacity (%):") {
medium(editorFadeOpacitySlider)
cell(editorFadeOpacitySlider)
}
}
}
@ -123,7 +113,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.toLowerCase()
private operator fun JTextComponent.getValue(a: AceSettingsPanel, p: KProperty<*>) = text.lowercase()
private operator fun JTextComponent.setValue(a: AceSettingsPanel, p: KProperty<*>, s: String) = setText(s)
private operator fun ColorPanel.getValue(a: AceSettingsPanel, p: KProperty<*>) = selectedColor