fixes #379

CHANGES.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 3.8.4
+
+- Fixes Declaration Mode in Rider, [#379](https://github.com/acejump/AceJump/issues/379)
+- Thanks to @igor-akhmetov for the help diagnosing!
+
 ## 3.8.3
 
 - Displays regular expression for regex-based queries

build.gradle.kts

@@ -5,8 +5,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
   idea apply true
   kotlin("jvm") version "1.5.20"
-  id("org.jetbrains.intellij") version "1.0"
-  id("org.jetbrains.changelog") version "1.1.2"
+  id("org.jetbrains.intellij") version "1.1.2"
+  id("org.jetbrains.changelog") version "1.2.0"
   id("com.github.ben-manes.versions") version "0.39.0"
 }
 
@@ -43,11 +43,11 @@ tasks {
 }
 
 changelog {
-  version = "3.8.3"
-  path = "${project.projectDir}/CHANGES.md"
-  header = closure { "[${project.version}] - ${date()}" }
-  itemPrefix = "-"
-  unreleasedTerm = "Unreleased"
+  version.set("3.8.4")
+  path.set("${project.projectDir}/CHANGES.md")
+  header.set(provider { "[${project.version}] - ${date()}" })
+  itemPrefix.set("-")
+  unreleasedTerm.set("Unreleased")
 }
 
 repositories {
@@ -70,4 +70,4 @@ intellij {
 }
 
 group = "org.acejump"
-version = "3.8.3"
+version = "3.8.4"

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

@@ -77,7 +77,7 @@ sealed class AceAction: DumbAwareAction() {
   class ToggleJumpMode        : BaseToggleJumpModeAction(JUMP)
   class ToggleJumpEndMode     : BaseToggleJumpModeAction(JUMP_END)
   class ToggleTargetMode      : BaseToggleJumpModeAction(TARGET)
-  class ToggleDeclarationMode : BaseToggleJumpModeAction(DEFINE)
+  class ToggleDeclarationMode : BaseToggleJumpModeAction(DECLARATION)
 
 
   class StartAllWordsMode          : BaseRegexSearchAction(ALL_WORDS, WHOLE_FILE)

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

@@ -1,7 +1,5 @@
 package org.acejump.action
 
-import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction
-import com.intellij.codeInsight.navigation.actions.GotoTypeDeclarationAction
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.command.CommandProcessor
@@ -62,8 +60,8 @@ internal class TagJumper(private val mode: JumpMode, private val searchProcessor
 
     visit(tag)
 
-    if (mode === DEFINE) {
-      performAction(if (shiftMode) GotoTypeDeclarationAction() else GotoDeclarationAction())
+    if (mode === DECLARATION) {
+      performAction(ActionManager.getInstance().getAction(if (shiftMode) "GotoTypeDeclaration" else "GotoDeclaration"))
       return
     }
 

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

@@ -11,7 +11,7 @@ data class AceSettings(
   var layout: KeyLayout = QWERTY,
   var allowedChars: String = layout.allChars,
   var cycleMode1: JumpMode = JumpMode.JUMP,
-  var cycleMode2: JumpMode = JumpMode.DEFINE,
+  var cycleMode2: JumpMode = JumpMode.DECLARATION,
   var cycleMode3: JumpMode = JumpMode.TARGET,
   var cycleMode4: JumpMode = JumpMode.JUMP_END,
   var minQueryLength: Int = 1,

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

@@ -59,15 +59,15 @@ enum class JumpMode {
    *
    * Always places the caret at the first character of the search query.
    */
-  DEFINE;
+  DECLARATION;
   
   val caretColor: Color
     get() = when (this) {
-      JUMP     -> AceConfig.jumpModeColor
-      JUMP_END -> AceConfig.jumpEndModeColor
-      DEFINE   -> AceConfig.definitionModeColor
-      TARGET   -> AceConfig.targetModeColor
-      DISABLED -> AbstractColorsScheme.INHERITED_COLOR_MARKER
+      JUMP        -> AceConfig.jumpModeColor
+      JUMP_END    -> AceConfig.jumpEndModeColor
+      DECLARATION -> AceConfig.definitionModeColor
+      TARGET      -> AceConfig.targetModeColor
+      DISABLED    -> AbstractColorsScheme.INHERITED_COLOR_MARKER
     }
   
   override fun toString() = when (this) {
@@ -75,6 +75,6 @@ enum class JumpMode {
     JUMP     -> "Jump"
     JUMP_END -> "Jump to End"
     TARGET   -> "Target"
-    DEFINE   -> "Definition"
+    DECLARATION   -> "Definition"
   }
 }