Use a single print-options variable to configure the debugger's

printing

Author: bbatsov

src/cider/nrepl/middleware/debug.clj

@@ -175,15 +175,15 @@ input requests. `read-debug-input` will halt until it finds its input in
 this map (identified by a key), and will `dissoc` it afterwards."}
   promises (atom {}))
 
-(defonce print-length (atom nil))
-(defonce print-level (atom nil))
+(defonce print-options (atom nil))
 (defonce step-in-to-next? (atom false))
 
 (defn pr-short
   "Like `pr-str` but limited in length and depth."
   [x]
-  (binding [*print-length* @print-length
-            *print-level*  @print-level]
+  (binding [*print-length* (:length @print-options)
+            *print-level*  (:level @print-options)]
+    ;; TODO: Make it possible to use a random print function here
     (pr-str x)))
 
 (defn- locals-for-message
@@ -620,12 +620,11 @@ this map (identified by a key), and will `dissoc` it afterwards."}
 
 (defn- initialize
   "Initialize the channel used for debug-input requests."
-  [{:keys [print-length print-level] :as msg}]
+  [{:keys [print-options] :as msg}]
   (when (map? @debugger-message)
     (debugger-send :status :done))
   ;; The above is just bureaucracy. The below is important.
-  (reset! @#'print-length print-length)
-  (reset! @#'print-level print-level)
+  (reset! @#'print-options print-options)
   (reset! debugger-message msg))
 
 (defn- instrumented-defs-reply

test/clj/cider/nrepl/middleware/debug_test.clj

@@ -188,8 +188,7 @@
            2))))
 
 (deftest pr-short-test
-  (reset! d/print-length 4)
-  (reset! d/print-level 2)
+  (reset! d/print-options {:length 4, :level 2})
   (is (< (count (d/pr-short [1 2 3 4 5 6 7 8 9 10]))
          (count (pr-str [1 2 3 4 5 6 7 8 9 10]))))
   (is (< (count (d/pr-short [[[1 2 3 4]]]))