diff options
| -rw-r--r-- | cider-repl.el | 6 | ||||
| -rw-r--r-- | cider.el | 36 | ||||
| -rw-r--r-- | doc/managing_connections.md | 16 |
3 files changed, 44 insertions, 14 deletions
diff --git a/cider-repl.el b/cider-repl.el index 1baba94e..0a3a4c5e 100644 --- a/cider-repl.el +++ b/cider-repl.el @@ -1578,8 +1578,6 @@ constructs." (declare-function cider-jack-in-cljs "cider") (declare-function cider-connect-clj "cider") (declare-function cider-connect-cljs "cider") -(declare-function cider-connect-sibling-clj "cider") -(declare-function cider-connect-sibling-cljs "cider") (defvar cider-repl-mode-map (let ((map (make-sparse-keymap))) @@ -1623,7 +1621,7 @@ constructs." (define-key map (kbd "C-c M-p") #'cider-repl-history) (define-key map (kbd "C-c M-t v") #'cider-toggle-trace-var) (define-key map (kbd "C-c M-t n") #'cider-toggle-trace-ns) - (define-key map (kbd "C-c C-x") #'cider-ns-refresh) + (define-key map (kbd "C-c C-x") 'cider-start-map) (define-key map (kbd "C-x C-e") #'cider-eval-last-sexp) (define-key map (kbd "C-c C-r") 'clojure-refactor-map) (define-key map (kbd "C-c C-v") 'cider-eval-commands-map) @@ -1631,8 +1629,6 @@ constructs." (define-key map (kbd "C-c M-J") #'cider-jack-in-cljs) (define-key map (kbd "C-c M-c") #'cider-connect-clj) (define-key map (kbd "C-c M-C") #'cider-connect-cljs) - (define-key map (kbd "C-c M-s") #'cider-connect-sibling-clj) - (define-key map (kbd "C-c M-S") #'cider-connect-sibling-cljs) (define-key map (string cider-repl-shortcut-dispatch-char) #'cider-repl-handle-shortcut) (easy-menu-define cider-repl-mode-menu map @@ -890,6 +890,39 @@ nil." ;;; User Level Connectors +(defvar cider-start-map + (let ((map (define-prefix-command 'cider-start-map))) + + (define-key map (kbd "j j") #'cider-jack-in-clj) + (define-key map (kbd "j s") #'cider-jack-in-cljs) + (define-key map (kbd "j m") #'cider-jack-in-clj&cljs) + (define-key map (kbd "C-j j") #'cider-jack-in-clj) + (define-key map (kbd "C-j s") #'cider-jack-in-cljs) + (define-key map (kbd "C-j m") #'cider-jack-in-clj&cljs) + (define-key map (kbd "C-j C-j") #'cider-jack-in-clj) + (define-key map (kbd "C-j C-s") #'cider-jack-in-cljs) + (define-key map (kbd "C-j C-m") #'cider-jack-in-clj&cljs) + + (define-key map (kbd "c j") #'cider-connect-clj) + (define-key map (kbd "c s") #'cider-connect-cljs) + (define-key map (kbd "c m") #'cider-connect-clj&cljs) + (define-key map (kbd "C-c j") #'cider-connect-clj) + (define-key map (kbd "C-c s") #'cider-connect-cljs) + (define-key map (kbd "C-c m") #'cider-connect-clj&cljs) + (define-key map (kbd "C-c C-j") #'cider-connect-clj) + (define-key map (kbd "C-c C-s") #'cider-connect-cljs) + (define-key map (kbd "C-c C-m") #'cider-connect-clj&cljs) + + (define-key map (kbd "s j") #'cider-connect-sibling-clj) + (define-key map (kbd "s s") #'cider-connect-sibling-cljs) + (define-key map (kbd "C-s j") #'cider-connect-sibling-clj) + (define-key map (kbd "C-s s") #'cider-connect-sibling-cljs) + (define-key map (kbd "C-s C-j") #'cider-connect-sibling-clj) + (define-key map (kbd "C-s C-s") #'cider-connect-sibling-cljs) + + map) + "CIDER jack-in and connect keymap.") + ;;;###autoload (defun cider-jack-in-clj (&optional do-prompt) "Start an nREPL server for the current project and connect to it. @@ -1197,8 +1230,7 @@ assume the command is available." (define-key clojure-mode-map (kbd "C-c M-J") #'cider-jack-in-cljs) (define-key clojure-mode-map (kbd "C-c M-c") #'cider-connect-clj) (define-key clojure-mode-map (kbd "C-c M-C") #'cider-connect-cljs) - (define-key clojure-mode-map (kbd "C-c M-s") #'cider-connect-sibling-clj) - (define-key clojure-mode-map (kbd "C-c M-S") #'cider-connect-sibling-cljs) + (define-key clojure-mode-map (kbd "C-c C-x") 'cider-start-map) (define-key clojure-mode-map (kbd "C-c C-s") 'sesman-map) (require 'sesman) (sesman-install-menu clojure-mode-map))) diff --git a/doc/managing_connections.md b/doc/managing_connections.md index 6e7a5906..d9e52fca 100644 --- a/doc/managing_connections.md +++ b/doc/managing_connections.md @@ -11,16 +11,18 @@ server. Start new sessions with - - <kbd>C-c M-j</kbd> `cider-jack-in-clj` - - <kbd>C-c M-J</kbd> `cider-jack-in-cljs` - - <kbd>C-c M-c</kbd> `cider-connect-clj` - - <kbd>C-c M-C</kbd> `cider-connect-cljs` - - <kbd>M-x</kbd> `cider-jack-in-clj&cljs` + - <kbd>C-c C-x j j</kbd> `cider-jack-in-clj` + - <kbd>C-c C-x j s</kbd> `cider-jack-in-cljs` + - <kbd>C-c C-x j m</kbd> `cider-jack-in-clj&cljs` + + - <kbd>C-c C-x c j</kbd> `cider-connect-clj` + - <kbd>C-c C-x c s</kbd> `cider-connect-cljs` + - <kbd>C-c C-x c m</kbd> `cider-connect-clj&cljs` Add new REPLs to the current session with - - <kbd>C-c M-s</kbd> `cider-connect-sibling-clj` - - <kbd>C-c M-S</kbd> `cider-connect-sibling-cljs` + - <kbd>C-c C-x s j</kbd> `cider-connect-sibling-clj` + - <kbd>C-c C-x s s</kbd> `cider-connect-sibling-cljs` !!! Tip |