fix: handle shortcuts nil in config file

ivokun · Jun 23, 2021 · 53b2d66 · 53b2d66
1 parent 809984e
commit 53b2d66
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/frontend/modules/shortcut/core.cljs b/src/main/frontend/modules/shortcut/core.cljs
@@ -3,6 +3,7 @@
             [frontend.handler.config :as config]
             [frontend.handler.notification :as notification]
             [frontend.modules.shortcut.data-helper :as dh]
+            [frontend.state :as state]
             [frontend.util :as util]
             [goog.events :as events]
             [goog.ui.KeyboardShortcutHandler.EventType :as EventType]
@@ -182,7 +183,9 @@
      (let [k (first args)
            keystroke (str/trim @local)]
        (when-not (empty? keystroke)
-         (config/set-config! [:shortcuts k] keystroke)))
+         (config/set-config! :shortcuts (merge
+                                         (:shortcuts (state/get-config))
+                                         {k keystroke}))))
 
      (when-let [^js handler (::key-record-handler state)]
        (.dispose handler))

diff --git a/templates/config.edn b/templates/config.edn
@@ -96,6 +96,8 @@
  ;;  :editor/down            ["ctrl+j" "down"]
  ;;  :editor/left            ["ctrl+h" "left"]
  ;;  :editor/right           ["ctrl+l" "right"]}
+ :shortcuts {}
+
  ;; Whether to show command doc on hover
  :ui/show-command-doc? true