Update keybinding prefix for test commands

3 files changed, 29 insertions, 19 deletions

diff --git a/README.md b/README.md
index 518e2873..ac4943ed 100644
--- a/README.md
+++ b/README.md
@@ -405,12 +405,12 @@ Keyboard shortcut                    | Description
 <kbd>C-c M-t v</kbd>                 | Toggle var tracing.
 <kbd>C-c M-t n</kbd>                 | Toggle namespace tracing.
 <kbd>C-c C-u</kbd>                   | Undefine a symbol. If invoked with a prefix argument, or no symbol is found at point, prompt for a symbol.
-<kbd>C-c t t</kbd>                   | Run test at point.
-<kbd>C-c t n</kbd>                   | Run tests for current namespace.
-<kbd>C-c t l</kbd>                   | Run tests for all loaded namespaces.
-<kbd>C-c t p</kbd>                   | Run tests for all project namespaces. This loads the additional namespaces.
-<kbd>C-c t r</kbd>                   | Re-run test failures/errors.
-<kbd>C-c C-t</kbd>                   | Show the test report buffer.
+<kbd>C-c C-t t</kbd>                 | Run test at point.
+<kbd>C-c C-t n</kbd>                 | Run tests for current namespace.
+<kbd>C-c C-t l</kbd>                 | Run tests for all loaded namespaces.
+<kbd>C-c C-t p</kbd>                 | Run tests for all project namespaces. This loads the additional namespaces.
+<kbd>C-c C-t r</kbd>                 | Re-run test failures/errors.
+<kbd>C-c C-t b</kbd>                 | Show the test report buffer.
 <kbd>M-.</kbd>                       | Jump to the definition of a symbol.  If invoked with a prefix argument, or no symbol is found at point, prompt for a symbol.
 <kbd>C-c M-.</kbd>                   | Jump to the resource referenced by the string at point.
 <kbd>C-c C-.</kbd>                   | Jump to some namespace on the classpath.
@@ -741,11 +741,11 @@ additional functionality at your disposal.
 
 Keyboard shortcut               | Description
 --------------------------------|-------------------------------
-<kbd>C-c t t</kbd>              | Run test at point.
-<kbd>C-c t n</kbd>              | Run tests for current namespace.
-<kbd>C-c t l</kbd>              | Run tests for all loaded namespaces.
-<kbd>C-c t p</kbd>              | Run tests for all project namespaces. This loads the additional namespaces.
-<kbd>C-c t r</kbd>              | Re-run test failures/errors.
+<kbd>C-c C-t t</kbd>            | Run test at point.
+<kbd>C-c C-t n</kbd>            | Run tests for current namespace.
+<kbd>C-c C-t l</kbd>            | Run tests for all loaded namespaces.
+<kbd>C-c C-t p</kbd>            | Run tests for all project namespaces. This loads the additional namespaces.
+<kbd>C-c C-t r</kbd>            | Re-run test failures/errors.
 <kbd>M-p</kbd>                  | Move point to previous test.
 <kbd>M-n</kbd>                  | Move point to next test.
 <kbd>t</kbd> and <kbd>M-.</kbd> | Jump to test definition.
diff --git a/cider-mode.el b/cider-mode.el
index 5999e98c..a67ff201 100644
--- a/cider-mode.el
+++ b/cider-mode.el
@@ -206,8 +206,8 @@ Returns to the buffer in which the command was invoked."
     (define-key map (kbd "C-c C-k") #'cider-load-buffer)
     (define-key map (kbd "C-c C-l") #'cider-load-file)
     (define-key map (kbd "C-c C-b") #'cider-interrupt)
-    (define-key map (kbd "C-c t")   'cider-test-commands-map)
-    (define-key map (kbd "C-c C-t") #'cider-test-show-report)
+    (define-key map (kbd "C-c ,")   'cider-test-commands-map)
+    (define-key map (kbd "C-c C-t") 'cider-test-commands-map)
     (define-key map (kbd "C-c M-s") #'cider-selector)
     (define-key map (kbd "C-c M-r") #'cider-rotate-default-connection)
     (define-key map (kbd "C-c M-d") #'cider-display-connection-info)
diff --git a/cider-test.el b/cider-test.el
index 50e17445..bae68f6c 100644
--- a/cider-test.el
+++ b/cider-test.el
@@ -118,16 +118,26 @@
 
 (defvar cider-test-commands-map
   (let ((map (define-prefix-command 'cider-test-commands-map)))
-    (define-key map (kbd "r") #'cider-test-rerun-tests)
-    (define-key map (kbd "t") #'cider-test-run-test)
-    (define-key map (kbd "n") #'cider-test-run-ns-tests)
-    (define-key map (kbd "l") #'cider-test-run-loaded-tests)
-    (define-key map (kbd "p") #'cider-test-run-project-tests)
+    ;; Duplicates of keys below with C- for convenience
+    (define-key map (kbd "C-r") #'cider-test-rerun-tests)
+    (define-key map (kbd "C-t") #'cider-test-run-test)
+    (define-key map (kbd "C-n") #'cider-test-run-ns-tests)
+    (define-key map (kbd "C-l") #'cider-test-run-loaded-tests)
+    (define-key map (kbd "C-p") #'cider-test-run-project-tests)
+    (define-key map (kbd "C-b") #'cider-test-show-report)
+    ;; Single-key bindings defined last for display in menu
+    (define-key map (kbd "r")   #'cider-test-rerun-tests)
+    (define-key map (kbd "t")   #'cider-test-run-test)
+    (define-key map (kbd "n")   #'cider-test-run-ns-tests)
+    (define-key map (kbd "l")   #'cider-test-run-loaded-tests)
+    (define-key map (kbd "p")   #'cider-test-run-project-tests)
+    (define-key map (kbd "b")   #'cider-test-show-report)
     map))
 
 (defvar cider-test-report-mode-map
   (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-c t") 'cider-test-commands-map)
+    (define-key map (kbd "C-c ,")   'cider-test-commands-map)
+    (define-key map (kbd "C-c C-t") 'cider-test-commands-map)
     (define-key map (kbd "M-p") #'cider-test-previous-result)
     (define-key map (kbd "M-n") #'cider-test-next-result)
     (define-key map (kbd "M-.") #'cider-test-jump)