From 87cd00eac74f23dba6a2f1b816a50c44234b41a4 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Sun, 12 Feb 2017 13:02:55 -0500 Subject: [PATCH] conventions: update debug conventions Step in and Step out are now, i and o respectively. Inspect a value is now v. Next step is now s. These new conventions better fit evilificiation. --- doc/CONVENTIONS.org | 7 ++++--- layers/+lang/clojure/README.org | 4 ++-- layers/+lang/clojure/packages.el | 2 +- layers/+lang/haskell/README.org | 6 +++--- layers/+lang/haskell/packages.el | 7 +++---- layers/+lang/scala/README.org | 4 ++-- layers/+lang/scala/packages.el | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/CONVENTIONS.org b/doc/CONVENTIONS.org index 85155ee20..d2cb57730 100644 --- a/doc/CONVENTIONS.org +++ b/doc/CONVENTIONS.org @@ -225,11 +225,12 @@ The base prefix for debugging commands is ~SPC d~. | ~m d B~ | clear all breakpoints | | ~m d c~ | continue | | ~m d d~ | start debug session | -| ~m d i~ | inspect value at point | +| ~m d i~ | step in | | ~m d l~ | local variables | -| ~m d n~ | next | +| ~m d o~ | step out | | ~m d r~ | run | -| ~m d s~ | step | +| ~m d s~ | next step | +| ~m d v~ | inspect value at point | Notes: - Ideally a transient-state for breakpoint navigation should be provided. diff --git a/layers/+lang/clojure/README.org b/layers/+lang/clojure/README.org index 3ed2dab38..8b150d7bf 100644 --- a/layers/+lang/clojure/README.org +++ b/layers/+lang/clojure/README.org @@ -200,10 +200,10 @@ As this state works the same for all files, the documentation is in global | Key Binding | Description | |-------------+--------------------------------| -| ~SPC m d r~ | reload namepspaces | | ~SPC m d b~ | instrument expression at point | | ~SPC m d e~ | display last stacktrace | -| ~SPC m d i~ | inspect expression at point | +| ~SPC m d r~ | reload namepspaces | +| ~SPC m d v~ | inspect expression at point | *** Refactoring diff --git a/layers/+lang/clojure/packages.el b/layers/+lang/clojure/packages.el index 20b430172..fb96c5fa3 100644 --- a/layers/+lang/clojure/packages.el +++ b/layers/+lang/clojure/packages.el @@ -170,7 +170,7 @@ "db" 'cider-debug-defun-at-point "de" 'spacemacs/cider-display-error-buffer - "di" 'cider-inspect + "dv" 'cider-inspect ;; refactorings from clojure-mode "rc{" 'clojure-convert-collection-to-map diff --git a/layers/+lang/haskell/README.org b/layers/+lang/haskell/README.org index 6054f0998..1a2dfedc9 100644 --- a/layers/+lang/haskell/README.org +++ b/layers/+lang/haskell/README.org @@ -218,10 +218,10 @@ Debug commands are prefixed by ~SPC m d~: | ~b~ | break on function | | ~c~ | continue the current computation | | ~d~ | delete object at the point | -| ~n~ | go to next step to inspect bindings | -| ~N~ or ~p~ | go to previous step to inspect the bindings | +| ~i~ | step into the next function | | ~r~ | refresh the debugger buffer | -| ~s~ | step into the next function | +| ~s~ | go to next step to inspect bindings | +| ~S~ | go to previous step to inspect the bindings | | ~t~ | trace the expression | ** REPL diff --git a/layers/+lang/haskell/packages.el b/layers/+lang/haskell/packages.el index edce607e2..1e2eeb7ca 100644 --- a/layers/+lang/haskell/packages.el +++ b/layers/+lang/haskell/packages.el @@ -180,11 +180,10 @@ "b" 'haskell-debug/break-on-function "c" 'haskell-debug/continue "d" 'haskell-debug/delete - "n" 'haskell-debug/next - "N" 'haskell-debug/previous - "p" 'haskell-debug/previous + "i" 'haskell-debug/step + "s" 'haskell-debug/next + "S" 'haskell-debug/previous "r" 'haskell-debug/refresh - "s" 'haskell-debug/step "t" 'haskell-debug/trace) ;; configure C-c C-l so it doesn't throw any errors diff --git a/layers/+lang/scala/README.org b/layers/+lang/scala/README.org index 0441ee16b..65f285ac0 100644 --- a/layers/+lang/scala/README.org +++ b/layers/+lang/scala/README.org @@ -180,13 +180,13 @@ with | ~SPC m d B~ | clear breakpoint | | ~SPC m d C~ | clear all breakpoints | | ~SPC m d c~ | continue | -| ~SPC m d i~ | inspect value at point | +| ~SPC m d i~ | step | | ~SPC m d n~ | next | | ~SPC m d o~ | step out | | ~SPC m d q~ | quit | | ~SPC m d r~ | run | -| ~SPC m d s~ | step | | ~SPC m d t~ | backtrace | +| ~SPC m d v~ | inspect value at point | *Note:* These key bindings need a transient-state, PR welcome :-) diff --git a/layers/+lang/scala/packages.el b/layers/+lang/scala/packages.el index b79a7e5fe..a0394f00e 100644 --- a/layers/+lang/scala/packages.el +++ b/layers/+lang/scala/packages.el @@ -123,13 +123,13 @@ "dB" 'ensime-db-clear-break "dC" 'ensime-db-clear-all-breaks "dc" 'ensime-db-continue - "di" 'ensime-db-inspect-value-at-point + "di" 'ensime-db-step "dn" 'ensime-db-next "do" 'ensime-db-step-out "dq" 'ensime-db-quit "dr" 'ensime-db-run - "ds" 'ensime-db-step "dt" 'ensime-db-backtrace + "dv" 'ensime-db-inspect-value-at-point "ee" 'ensime-print-errors-at-point "el" 'ensime-show-all-errors-and-warnings