From a1d60c0c8238bc0a21b50e6c26c67daec58d245b Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Tue, 7 Jun 2016 23:36:06 -0400 Subject: [PATCH] haskell: unify key bindings for debugging --- layers/+lang/haskell/README.org | 31 +++++++++++++++++-------------- layers/+lang/haskell/packages.el | 16 ++++++++++------ 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/layers/+lang/haskell/README.org b/layers/+lang/haskell/README.org index 38af263ec..b96bd18c3 100644 --- a/layers/+lang/haskell/README.org +++ b/layers/+lang/haskell/README.org @@ -280,28 +280,31 @@ Debug commands are prefixed by ~SPC m d~: | Key Binding | Description | |-------------+--------------------------------------------| -| ~SPC m d d~ | start debug process, needs to be run first | +| ~SPC m d a~ | abandon current process | | ~SPC m d b~ | insert breakpoint at function | -| ~SPC m d n~ | next breakpoint | -| ~SPC m d N~ | previous breakpoint | | ~SPC m d B~ | delete breakpoint | | ~SPC m d c~ | continue current process | -| ~SPC m d a~ | abandon current process | +| ~SPC m d d~ | start debug process, needs to be run first | +| ~SPC m d n~ | next breakpoint | +| ~SPC m d N~ | previous breakpoint | +| ~SPC m d p~ | previous breakpoint | | ~SPC m d r~ | refresh process buffer | +| ~SPC m d s~ | step into the next function | +| ~SPC m d t~ | trace the expression | ** Debug Buffer | Key Binding | Description | |-------------+---------------------------------------------| -| ~RET~ | select object at the point | -| ~a~ | abandon current computation | -| ~b~ | break on function | -| ~c~ | continue the current computation | -| ~d~ | delete object at the point | -| ~g~ | refresh the debugger buffer | -| ~n~ | go to next step to inspect bindings | -| ~p~ | go to previous step to inspect the bindings | -| ~s~ | step into the next function | -| ~t~ | trace the expression | +| ~RET~ | select object at the point | +| ~a~ | abandon current computation | +| ~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 | +| ~r~ | refresh the debugger buffer | +| ~s~ | step into the next function | +| ~t~ | trace the expression | ** REPL REPL commands are prefixed by ~SPC m s~: diff --git a/layers/+lang/haskell/packages.el b/layers/+lang/haskell/packages.el index 43c423b40..7ea3cbd75 100644 --- a/layers/+lang/haskell/packages.el +++ b/layers/+lang/haskell/packages.el @@ -188,14 +188,17 @@ "hT" 'spacemacs/haskell-process-do-type-on-prev-line "hy" 'hayoo - "dd" 'haskell-debug + "da" 'haskell-debug/abandon "db" 'haskell-debug/break-on-function - "dn" 'haskell-debug/next - "dN" 'haskell-debug/previous "dB" 'haskell-debug/delete "dc" 'haskell-debug/continue - "da" 'haskell-debug/abandon - "dr" 'haskell-debug/refresh)) + "dd" 'haskell-debug + "dn" 'haskell-debug/next + "dN" 'haskell-debug/previous + "dp" 'haskell-debug/previous + "dr" 'haskell-debug/refresh + "ds" 'haskell-debug/step + "dt" 'haskell-debug/trace)) (evilified-state-evilify haskell-debug-mode haskell-debug-mode-map "RET" 'haskell-debug/select @@ -203,9 +206,10 @@ "b" 'haskell-debug/break-on-function "c" 'haskell-debug/continue "d" 'haskell-debug/delete - "g" 'haskell-debug/refresh "n" 'haskell-debug/next + "N" 'haskell-debug/previous "p" 'haskell-debug/previous + "r" 'haskell-debug/refresh "s" 'haskell-debug/step "t" 'haskell-debug/trace)