From 3762b9e2382814cdd7dbd9fa77d520ced062343e Mon Sep 17 00:00:00 2001 From: yuhan0 Date: Thu, 17 Oct 2019 12:16:50 +0800 Subject: [PATCH] Rename :Continue command to :continue-all, tweak docstring Update :Continue -> :continue-all in debug-integration-test --- src/cider/nrepl/middleware/debug.clj | 14 +++++++++----- .../nrepl/middleware/debug_integration_test.clj | 6 +++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/cider/nrepl/middleware/debug.clj b/src/cider/nrepl/middleware/debug.clj index c6483a68b..ceb431054 100644 --- a/src/cider/nrepl/middleware/debug.clj +++ b/src/cider/nrepl/middleware/debug.clj @@ -299,7 +299,7 @@ this map (identified by a key), and will `dissoc` it afterwards."} (def debug-commands "An unsorted set of commands supported by the debugger." #{:continue - :Continue + :continue-all :eval :here :in @@ -317,13 +317,17 @@ this map (identified by a key), and will `dissoc` it afterwards."} Ask for one of the following debug commands using `read-debug-input`: next: Return value. - continue: Skip breakpoints for the remainder of this eval session. + continue: Skip the current breakpoint. + continue-all: Skip breakpoints for the remainder of this eval session. + in: Step into a function out: Skip breakpoints in the current sexp. - inspect: Evaluate an expression and inspect it. + here: Skip all breakpoints up till specified coordinate `coord` + inspect: Prompt for an expression to evaluate and inspect it. locals: Inspect local variables. inject: Evaluate an expression and return it. eval: Evaluate an expression, display result, and prompt again. stacktrace: Print the current stacktrace, and prompt again. + trace: Continue, printing intermediate expressions and their values. quit: Abort current eval session. Response received can be any one of these values. It can also be a map @@ -355,8 +359,8 @@ this map (identified by a key), and will `dissoc` it afterwards."} value) :continue (do (reset! (:skip STATE__) true) value) - :Continue (do (skip-breaks! :all) - value) + :continue-all (do (skip-breaks! :all) + value) :out (do (skip-breaks! :deeper (butlast (:coor dbg-state)) (:code dbg-state) force?) value) :here (do (skip-breaks! :before coord (:code dbg-state) force?) diff --git a/test/clj/cider/nrepl/middleware/debug_integration_test.clj b/test/clj/cider/nrepl/middleware/debug_integration_test.clj index ba390a8a1..d12e97388 100644 --- a/test/clj/cider/nrepl/middleware/debug_integration_test.clj +++ b/test/clj/cider/nrepl/middleware/debug_integration_test.clj @@ -96,7 +96,7 @@ (def-debug-op :next) (def-debug-op :continue) -(def-debug-op :Continue) +(def-debug-op :continue-all) (def-debug-op :in) (defmethod debugger-send :out [_ & [force?]] @@ -261,7 +261,7 @@ (<-- {:debug-value "1" :coor [1 3 1]}) ; a in foo (--> :continue) (<-- {:debug-value "2" :coor [1 3 1]}) ; a in foo - (--> :Continue) + (--> :continue-all) (<-- {:value ":fin"}) (<-- {:status ["done"]}))) @@ -615,6 +615,6 @@ (.startsWith file "jar:file:") (.endsWith file "/nrepl/server.clj")) - (--> :Continue) + (--> :continue-all) (<-- {:value "{:transport 23}"}) (<-- {:status ["done"]}))