fixes #431

CHANGES.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 3.8.13
+
+- Fixes for color settings not being persisted, [$431](https://github.com/acejump/AceJump/issues/431)
+
 ## 3.8.12
 
 - Fixes tag cycling issue with Enter/Shift+Enter, [#429](https://github.com/acejump/AceJump/issues/429)

build.gradle.kts

@@ -41,7 +41,6 @@ tasks {
   }
 
   // Remove pending: https://youtrack.jetbrains.com/issue/IDEA-278926
-  @Suppress("UNUSED_VARIABLE")
   val test by getting(Test::class) {
     isScanForTestClasses = false
     // Only run tests from classes that end with "Test"
@@ -65,7 +64,7 @@ kotlin {
 }
 
 changelog {
-  version.set("3.8.12")
+  version.set("3.8.13")
   path.set("${project.projectDir}/CHANGES.md")
   header.set(provider { "[${project.version}] - ${date()}" })
   itemPrefix.set("-")
@@ -89,4 +88,4 @@ intellij {
 }
 
 group = "org.acejump"
-version = "3.8.12"
+version = "3.8.13"

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

@@ -31,7 +31,8 @@ sealed class AceAction: DumbAwareAction() {
   
     if (project != null) {
       try {
-        val openEditors = FileEditorManagerEx.getInstanceEx(project).splitters.getSelectedEditors()
+        val openEditors =
+          FileEditorManagerEx.getInstanceEx(project).splitters.getSelectedEditors()
           .mapNotNull { (it as? TextEditor)?.editor }
           .sortedBy { if (it === editor) 0 else 1 }
         invoke(SessionManager.start(editor, openEditors))

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

@@ -22,13 +22,13 @@ class AceConfig: PersistentStateComponent<AceSettings> {
     val layout get()              = settings.layout
     val cycleModes get()          = settings.let { arrayOf(it.cycleMode1, it.cycleMode2, it.cycleMode3, it.cycleMode4) }
     val minQueryLength get()      = settings.minQueryLength
-    val jumpModeColor get()       = settings.jumpModeColor
+    val jumpModeColor get()       = settings.getJumpModeJBC()
-    val jumpEndModeColor get()    = settings.jumpEndModeColor
+    val jumpEndModeColor get()    = settings.getJumpEndModeJBC()
-    val targetModeColor get()     = settings.targetModeColor
+    val targetModeColor get()     = settings.getTargetModeJBC()
-    val definitionModeColor get() = settings.definitionModeColor
+    val definitionModeColor get() = settings.getDefinitionModeJBC()
-    val textHighlightColor get()  = settings.textHighlightColor
+    val textHighlightColor get()  = settings.getTextHighlightJBC()
-    val tagForegroundColor get()  = settings.tagForegroundColor
+    val tagForegroundColor get()  = settings.getTagForegroundJBC()
-    val tagBackgroundColor get()  = settings.tagBackgroundColor
+    val tagBackgroundColor get()  = settings.getTagBackgroundJBC()
     val searchWholeFile get()     = settings.searchWholeFile
     val mapToASCII get()        = settings.mapToASCII
     val showSearchNotification get()          = settings.showSearchNotification

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

@@ -1,7 +1,6 @@
 package org.acejump.config
 
 import com.intellij.openapi.options.Configurable
-import com.intellij.ui.JBColor
 import org.acejump.config.AceConfig.Companion.settings
 import org.acejump.input.KeyLayoutCache
 
@@ -20,13 +19,13 @@ class AceConfigurable: Configurable {
       panel.cycleMode3 != settings.cycleMode3 ||
       panel.cycleMode4 != settings.cycleMode4 ||
       panel.minQueryLengthInt != settings.minQueryLength ||
-      panel.jumpModeColor != settings.jumpModeColor ||
+      panel.jumpModeColor?.rgb != settings.jumpModeColor ||
-      panel.jumpEndModeColor != settings.jumpEndModeColor ||
+      panel.jumpEndModeColor?.rgb != settings.jumpEndModeColor ||
-      panel.targetModeColor != settings.targetModeColor ||
+      panel.targetModeColor?.rgb != settings.targetModeColor ||
-      panel.definitionModeColor != settings.definitionModeColor ||
+      panel.definitionModeColor?.rgb != settings.definitionModeColor ||
-      panel.textHighlightColor != settings.textHighlightColor ||
+      panel.textHighlightColor?.rgb != settings.textHighlightColor ||
-      panel.tagForegroundColor != settings.tagForegroundColor ||
+      panel.tagForegroundColor?.rgb != settings.tagForegroundColor ||
-      panel.tagBackgroundColor != settings.tagBackgroundColor ||
+      panel.tagBackgroundColor?.rgb != settings.tagBackgroundColor ||
       panel.searchWholeFile != settings.searchWholeFile ||
       panel.mapToASCII != settings.mapToASCII ||
       panel.showSearchNotification != settings.showSearchNotification
@@ -39,13 +38,13 @@ class AceConfigurable: Configurable {
     settings.cycleMode3 = panel.cycleMode3
     settings.cycleMode4 = panel.cycleMode4
     settings.minQueryLength = panel.minQueryLengthInt ?: settings.minQueryLength
-    panel.jumpModeColor?.let { settings.jumpModeColor = JBColor.namedColor("jumpModeRGB", it) }
+    panel.jumpModeColor?.let { settings.jumpModeColor = it.rgb }
-    panel.jumpEndModeColor?.let { settings.jumpEndModeColor = JBColor.namedColor("jumpEndModeRGB", it) }
+    panel.jumpEndModeColor?.let { settings.jumpEndModeColor = it.rgb }
-    panel.targetModeColor?.let { settings.targetModeColor = JBColor.namedColor("targetModeRGB", it) }
+    panel.targetModeColor?.let { settings.targetModeColor = it.rgb }
-    panel.definitionModeColor?.let { settings.definitionModeColor = JBColor.namedColor("definitionModeRGB", it) }
+    panel.definitionModeColor?.let { settings.definitionModeColor = it.rgb }
-    panel.textHighlightColor?.let { settings.textHighlightColor = JBColor.namedColor("textHighlightRGB", it) }
+    panel.textHighlightColor?.let { settings.textHighlightColor = it.rgb }
-    panel.tagForegroundColor?.let { settings.tagForegroundColor = JBColor.namedColor("tagForegroundRGB", it) }
+    panel.tagForegroundColor?.let { settings.tagForegroundColor = it.rgb }
-    panel.tagBackgroundColor?.let { settings.tagBackgroundColor = JBColor.namedColor("tagBackgroundRGB", it) }
+    panel.tagBackgroundColor?.let { settings.tagBackgroundColor = it.rgb }
     settings.searchWholeFile = panel.searchWholeFile
     settings.mapToASCII = panel.mapToASCII
     settings.showSearchNotification = panel.showSearchNotification

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

@@ -13,23 +13,31 @@ data class AceSettings(
   var cycleMode4: JumpMode = JumpMode.JUMP_END,
   var minQueryLength: Int = 1,
 
-  var jumpModeColor: JBColor = JBColor.namedColor("jumpModeRGB", 0xFFFFFF),
+  var jumpModeColor: Int = 0xFFFFFF,
 
-  var jumpEndModeColor: JBColor = JBColor.namedColor("jumpEndModeRGB", 0x33E78A),
+  var jumpEndModeColor: Int = 0x33E78A,
 
-  var targetModeColor: JBColor = JBColor.namedColor("targetModeRGB", 0xFFB700),
+  var targetModeColor: Int = 0xFFB700,
 
-  var definitionModeColor: JBColor = JBColor.namedColor("definitionModeRGB", 0x6FC5FF),
+  var definitionModeColor: Int = 0x6FC5FF,
 
-  var textHighlightColor: JBColor = JBColor.namedColor("textHighlightRGB", 0x394B58),
+  var textHighlightColor: Int = 0x394B58,
 
-  var tagForegroundColor: JBColor = JBColor.namedColor("tagForegroundRGB", 0xFFFFFF),
+  var tagForegroundColor: Int = 0xFFFFFF,
 
-  var tagBackgroundColor: JBColor = JBColor.namedColor("tagBackgroundRGB", 0x008299),
+  var tagBackgroundColor: Int = 0x008299,
 
   var searchWholeFile: Boolean = true,
 
   var mapToASCII: Boolean = false,
 
   var showSearchNotification: Boolean = false
-)
+) {
+  fun getJumpModeJBC() = JBColor.namedColor("jumpModeRGB", jumpModeColor)
+  fun getJumpEndModeJBC() = JBColor.namedColor("jumpEndModeRGB", jumpEndModeColor)
+  fun getTargetModeJBC() = JBColor.namedColor("targetModeRGB", targetModeColor)
+  fun getDefinitionModeJBC() = JBColor.namedColor("definitionModeRGB", definitionModeColor)
+  fun getTextHighlightJBC() = JBColor.namedColor("textHighlightRGB", textHighlightColor)
+  fun getTagForegroundJBC() = JBColor.namedColor("tagForegroundRGB", tagForegroundColor)
+  fun getTagBackgroundJBC() = JBColor.namedColor("tagBackgroundRGB", tagBackgroundColor)
+}

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

@@ -116,13 +116,13 @@ internal class AceSettingsPanel {
     cycleMode3 = settings.cycleMode3
     cycleMode4 = settings.cycleMode4
     minQueryLength = settings.minQueryLength.toString()
-    jumpModeColor = settings.jumpModeColor
+    jumpModeColor = settings.getJumpModeJBC()
-    jumpEndModeColor = settings.jumpEndModeColor
+    jumpEndModeColor = settings.getJumpEndModeJBC()
-    targetModeColor = settings.targetModeColor
+    targetModeColor = settings.getTargetModeJBC()
-    definitionModeColor = settings.definitionModeColor
+    definitionModeColor = settings.getDefinitionModeJBC()
-    textHighlightColor = settings.textHighlightColor
+    textHighlightColor = settings.getTextHighlightJBC()
-    tagForegroundColor = settings.tagForegroundColor
+    tagForegroundColor = settings.getTagForegroundJBC()
-    tagBackgroundColor = settings.tagBackgroundColor
+    tagBackgroundColor = settings.getTagBackgroundJBC()
     searchWholeFile = settings.searchWholeFile
     mapToASCII = settings.mapToASCII
     showSearchNotification = settings.showSearchNotification