Fix default shortcuts being added for already customized shortcuts.

Author: ericdallo

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+ 
+- Fix default shortcuts being added for already customized shortcuts.
 
 ## 2.6.2
 

build.gradle.kts

@@ -5,7 +5,7 @@ fun properties(key: String) = project.findProperty(key).toString()
 plugins {
     id("org.jetbrains.kotlin.jvm") version "1.9.0"
     id("dev.clojurephant.clojure") version "0.7.0"
-    id("org.jetbrains.intellij") version "1.15.0"
+    id("org.jetbrains.intellij") version "1.17.4"
     id("org.jetbrains.changelog") version "1.3.1"
     id("org.jetbrains.grammarkit") version "2021.2.2"
 }
@@ -24,7 +24,7 @@ repositories {
 
 dependencies {
     implementation ("org.clojure:clojure:1.11.1")
-    implementation ("com.github.ericdallo:clj4intellij:0.5.2")
+    implementation ("com.github.ericdallo:clj4intellij:0.5.3")
     implementation ("seesaw:seesaw:1.5.0")
     implementation ("camel-snake-kebab:camel-snake-kebab:0.4.3")
     implementation ("babashka:process:0.5.18")
@@ -138,7 +138,7 @@ tasks {
         // pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
         // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
         // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
-        channels.set(listOf(properties("pluginVersion").split('-').getOrElse(1) { "default" }.split('.').first()))
+        channels.set(listOf("default"))
     }
 
     buildSearchableOptions {

deps.edn

@@ -2,7 +2,7 @@
  :mvn/repos {"intellij-1" {:url "https://cache-redirector.jetbrains.com/intellij-dependencies"}
              "intellij-2" {:url "https://www.jetbrains.com/intellij-repository/releases"}}
  :deps {org.clojure/clojure {:mvn/version "1.11.1"}
-        com.github.ericdallo/clj4intellij {:mvn/version "0.5.2"}
+        com.github.ericdallo/clj4intellij {:mvn/version "0.5.3"}
         seesaw/seesaw {:mvn/version "1.5.0"}
         camel-snake-kebab/camel-snake-kebab {:mvn/version "0.4.3"}
         com.github.clojure-lsp/clojure-lsp {:mvn/version "2024.03.01-11.37.51"}

src/main/clojure/com/github/clojure_lsp/intellij/extension/register_actions_startup.clj

@@ -56,12 +56,12 @@
    {:name "thread-last" :text "Thread last expression" :description "Thread last expression"}
    {:name "unwind-all" :text "Unwind whole thread" :description "Unwind whole thread"}
    {:name "unwind-thread" :text "Unwind thread once" :description "Unwind thread once"}
-   {:name "forward-slurp" :text "Slurp forward" :description "Slurp forward" :keyboard-shortcut {:first "alt CLOSE_BRACKET" :replace-all true}}
-   {:name "forward-barf" :text "Barf forward" :description "Barf forward" :keyboard-shortcut {:first "alt OPEN_BRACKET" :replace-all true}}
-   {:name "backward-slurp" :text "Slurp backward" :description "Slurp backward" :keyboard-shortcut {:first "alt shift CLOSE_BRACKET" :replace-all true}}
-   {:name "backward-barf" :text "Barf backward" :description "Barf backward" :keyboard-shortcut {:first "alt shift OPEN_BRACKET" :replace-all true}}
-   {:name "raise-sexp" :text "Raise sexpr" :description "Raise current sexpr" :keyboard-shortcut {:first "alt R" :replace-all true}}
-   {:name "kill-sexp" :text "Kill sexpr" :description "Kill current sexpr" :keyboard-shortcut {:first "alt K" :replace-all true}}])
+   {:name "forward-slurp" :text "Slurp forward" :description "Slurp forward (Paredit)" :keyboard-shortcut {:first "alt CLOSE_BRACKET" :replace-all true}}
+   {:name "forward-barf" :text "Barf forward" :description "Barf forward (Paredit)" :keyboard-shortcut {:first "alt OPEN_BRACKET" :replace-all true}}
+   {:name "backward-slurp" :text "Slurp backward" :description "Slurp backward (Paredit)" :keyboard-shortcut {:first "alt shift CLOSE_BRACKET" :replace-all true}}
+   {:name "backward-barf" :text "Barf backward" :description "Barf backward (Paredit)" :keyboard-shortcut {:first "alt shift OPEN_BRACKET" :replace-all true}}
+   {:name "raise-sexp" :text "Raise sexpr" :description "Raise current sexpr (Paredit)" :keyboard-shortcut {:first "alt R" :replace-all true}}
+   {:name "kill-sexp" :text "Kill sexpr" :description "Kill current sexpr (Paredit)" :keyboard-shortcut {:first "alt K" :replace-all true}}])
 
 (defn -runActivity [_this ^Project _project]
   (action/register-action! :id "ClojureLSP.FindReferences"