lang/clojure: bind cider-jack-in to clojure-mode

cider-quit kills cider-mode, rendering cider-mode-map keybinds
unavailable, so these commands have been moved to clojure-mode-map, to
ensure they're always available.

Reported by @mfiano
This commit is contained in:
Henrik Lissner 2018-10-15 16:14:37 -04:00
parent 476782e6d4
commit cade77e4a9
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -32,51 +32,52 @@
cider-repl-use-clojure-font-lock t) cider-repl-use-clojure-font-lock t)
;; TODO: Add mode-local labels when general support is in. ;; TODO: Add mode-local labels when general support is in.
(map! :map cider-mode-map (map! :localleader
:localleader (:map clojure-mode-map
:n "'" #'cider-jack-in :n "'" #'cider-jack-in
:n "\"" #'cider-jack-in-clojurescript :n "\"" #'cider-jack-in-clojurescript)
;; eval (:map cider-mode-map
(:prefix "e" ;; eval
:n "d" #'cider-eval-defun-at-point (:prefix "e"
:n "D" #'cider-insert-defun-in-repl :n "d" #'cider-eval-defun-at-point
:n "e" #'cider-eval-last-sexp :n "D" #'cider-insert-defun-in-repl
:n "E" #'cider-insert-last-sexp-in-repl :n "e" #'cider-eval-last-sexp
:n "r" #'cider-eval-region :n "E" #'cider-insert-last-sexp-in-repl
:n "R" #'cider-insert-region-in-repl :n "r" #'cider-eval-region
:n "u" #'cider-undef) :n "R" #'cider-insert-region-in-repl
;; go/jump :n "u" #'cider-undef)
(:prefix "g" ;; go/jump
:n "b" #'cider-pop-back (:prefix "g"
:n "g" #'cider-find-var :n "b" #'cider-pop-back
:n "n" #'cider-find-ns) :n "g" #'cider-find-var
;; help :n "n" #'cider-find-ns)
(:prefix "h" ;; help
:n "n" 'cider-find-ns (:prefix "h"
:n "a" 'cider-apropos :n "n" 'cider-find-ns
:n "d" 'cider-doc :n "a" 'cider-apropos
:n "g" 'cider-grimoire-web :n "d" 'cider-doc
:n "j" 'cider-javadoc) :n "g" 'cider-grimoire-web
;; inspect :n "j" 'cider-javadoc)
(:prefix "i" ;; inspect
:n "i" 'cider-inspect (:prefix "i"
:n "r" 'cider-inspect-last-result) :n "i" 'cider-inspect
;; macro :n "r" 'cider-inspect-last-result)
(:prefix "m" ;; macro
:n "e" 'cider-macroexpand-1 (:prefix "m"
:n "E" 'cider-macroexpand-al) :n "e" 'cider-macroexpand-1
;; namespace :n "E" 'cider-macroexpand-al)
(:prefix "n" ;; namespace
:n "n" 'cider-browse-ns (:prefix "n"
:n "N" 'cider-browse-ns-all) :n "n" 'cider-browse-ns
;; repl :n "N" 'cider-browse-ns-all)
(:prefix "r" ;; repl
:n "n" 'cider-repl-set-ns (:prefix "r"
:n "q" 'cider-quit :n "n" 'cider-repl-set-ns
:n "r" 'cider-refresh :n "q" 'cider-quit
:n "R" 'cider-restart :n "r" 'cider-refresh
:n "B" #'cider-switch-to-repl-buffer :n "R" 'cider-restart
:n "c" #'cider-repl-clear-buffer)) :n "B" #'cider-switch-to-repl-buffer
:n "c" #'cider-repl-clear-buffer)))
(when (featurep! :feature evil +everywhere) (when (featurep! :feature evil +everywhere)
(add-hook 'cider-repl-mode-hook #'evil-normalize-keymaps))) (add-hook 'cider-repl-mode-hook #'evil-normalize-keymaps)))