emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(clojure): leverage evil-collection-cider

Browse source 
We're currently discarding all evil-collection bindings on
`cider--debug-mode`. Given that `j` is bound to a particularly
disruptive and non-cancellable command, this brings some friction to
evil users.

This commit adds those bindings back under `evil +everywhere`.

The in-buffer and minibuffer displayed keybindings were adjusted to
match, but not easy-menu's.

Ref: doomemacs/doomemacs#4627
This commit is contained in:
Samuel Tschiedel 2023-10-22 09:20:25 -03:00 • committed by Henrik Lissner
parent 9fe9f89333
commit c862968f48
1 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
modules/lang/clojure/config.el
View file

@ -122,13 +122,34 @@
(with-current-buffer nrepl-server-buffer (with-current-buffer nrepl-server-buffer
(buffer-string))))))) (buffer-string)))))))
;; When in cider-debug-mode, override evil keys to not interfere with debug keys
(after! evil (after! evil
(if (modulep! :editor evil +everywhere)
;; Match evil-collection keybindings to debugging overlay
(after! (cider-debug evil-collection-cider)
(mapc
(lambda (replacement)
(let* ((from (car replacement))
(to (cadr replacement))
(item (assoc from cider-debug-prompt-commands)))
;; Position matters, hence the update-in-place
(setf (car item) (car to))
(setf (cdr item) (cdr to))))
'((?h (?H "here" "Here"))
(?i (?I "in" "In"))
(?j (?J "inject" "inJect"))
(?l (?L "locals" "Locals"))))
;; Prevent evil-snipe from overriding evil-collection
(add-hook! cider--debug-mode
'turn-off-evil-snipe-mode
'turn-off-evil-snipe-override-mode))
;; When in cider-debug-mode, override evil keys to not interfere with debug keys
(add-hook! cider--debug-mode (add-hook! cider--debug-mode
(defun +clojure--cider-setup-debug () (defun +clojure--cider-setup-debug ()
"Setup cider debug to override evil keys cleanly" "Setup cider debug to override evil keys cleanly"
(evil-make-overriding-map cider--debug-mode-map 'normal) (evil-make-overriding-map cider--debug-mode-map 'normal)
(evil-normalize-keymaps)))) (evil-normalize-keymaps)))))
(when (modulep! :ui modeline +light) (when (modulep! :ui modeline +light)
(defvar-local cider-modeline-icon nil) (defvar-local cider-modeline-icon nil)