Move *skip-breaks* reset to wrap-debug to make the intention clearer

src/cider/nrepl/middleware/debug.clj

@@ -423,7 +423,6 @@
                               ;; wrong than right.
                               (update :column #(if (= % 1) 0 %))))
                   :forms @*tmp-forms*}]
-     (skip-breaks! nil)
      ~@body))
 
 (defn break
@@ -535,9 +534,7 @@
 ;;; ## Middleware
 (defn- maybe-debug
   "Return msg, prepared for debugging if code contains debugging macros."
-  [{:keys [code session ns] :as msg}]
-  (when (instance? clojure.lang.Atom session)
-    (swap! session assoc #'*skip-breaks* (atom nil)))
+  [{:keys [code] :as msg}]
   ;; The best way of checking if there's a #break reader-macro in
   ;; `code` is by reading it, in which case it toggles `has-debug?`.
   (let [has-debug? (atom false)
@@ -577,9 +574,11 @@
        (transport/send (:transport msg))))
 
 (defn wrap-debug [h]
-  (fn [{:keys [op input] :as msg}]
+  (fn [{:keys [op input session] :as msg}]
     (case op
-      "eval" (h (maybe-debug msg))
+      "eval" (do (when (instance? clojure.lang.Atom session)
+                   (swap! session assoc #'*skip-breaks* (atom nil)))
+                 (h (maybe-debug msg)))
       "debug-instrumented-defs" (instrumented-defs-reply msg)
       "debug-input" (when-let [pro (@promises (:key msg))]
                       (swap! promises dissoc  (:key msg))