Add pretty view mode

Author: r0man

project.clj

@@ -22,7 +22,7 @@
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :scm {:name "git" :url "https://github.com/clojure-emacs/cider-nrepl"}
   :dependencies [[nrepl/nrepl "1.3.1" :exclusions [org.clojure/clojure]]
-                 [cider/orchard "0.33.0" :exclusions [org.clojure/clojure]]
+                 [cider/orchard "0.34.0" :exclusions [org.clojure/clojure]]
                  ^:inline-dep [fipp ~fipp-version] ; can be removed in unresolved-tree mode
                  ^:inline-dep [compliment "0.7.0"]
                  ^:inline-dep [org.rksm/suitable "0.6.2" :exclusions [org.clojure/clojure

src/cider/nrepl/middleware/inspect.clj

@@ -80,8 +80,8 @@
 (defn- toggle-view-mode [{:keys [view-mode] :as inspector}]
   ;; The order in which view modes are cycled depends on the inspected object.
   (let [toggle-order (if (inspect/supports-table-view-mode? inspector)
-                       {:normal :table, :table :object, :object :normal}
-                       {:normal :object, :object :normal})
+                       {:normal :table, :table :object, :object :pretty, :pretty :normal}
+                       {:normal :object, :objet :pretty, :pretty :normal})
         next-view-mode (toggle-order view-mode :normal)]
     (inspect/set-view-mode inspector next-view-mode)))
 

test/clj/cider/nrepl/middleware/inspect_test.clj

@@ -691,6 +691,34 @@
     (is+ (matchers/prefix table-mode-prefix)
          (value-skip-header (session/message {:op "inspect-toggle-view-mode"})))))
 
+(deftest pretty-view-mode-integration-test
+  (testing "pretty view-mode renders an object with a pretty printer"
+    (session/message {:op "inspect-clear"})
+    (session/message {:op      "eval"
+                      :inspect "true"
+                      :code    "(repeat 5 {:a (repeat 5 {:b 2}) :c (repeat 5 {:d 2})})"})
+    (session/message {:op "inspect-toggle-view-mode"})
+    (session/message {:op "inspect-toggle-view-mode"})
+    (is+ ["--- Contents:" [:newline]
+          "  0. " [:value (str "{:a ({:b 2} {:b 2} {:b 2} {:b 2} {:b 2}),"
+                               "\n      :c ({:d 2} {:d 2} {:d 2} {:d 2} {:d 2})}") 1]
+          [:newline]
+          "  1. " [:value (str "{:a ({:b 2} {:b 2} {:b 2} {:b 2} {:b 2}),"
+                               "\n      :c ({:d 2} {:d 2} {:d 2} {:d 2} {:d 2})}") 2]
+          [:newline]
+          "  2. " [:value (str "{:a ({:b 2} {:b 2} {:b 2} {:b 2} {:b 2}),"
+                               "\n      :c ({:d 2} {:d 2} {:d 2} {:d 2} {:d 2})}") 3]
+          [:newline]
+          "  3. " [:value (str "{:a ({:b 2} {:b 2} {:b 2} {:b 2} {:b 2}),"
+                               "\n      :c ({:d 2} {:d 2} {:d 2} {:d 2} {:d 2})}") 4]
+          [:newline]
+          "  4. " [:value (str "{:a ({:b 2} {:b 2} {:b 2} {:b 2} {:b 2}),"
+                               "\n      :c ({:d 2} {:d 2} {:d 2} {:d 2} {:d 2})}") 5]
+          [:newline] [:newline]
+          "--- View mode:" [:newline]
+          "  :pretty"]
+         (value-skip-header (session/message {:op "inspect-toggle-view-mode"})))))
+
 (deftest print-length-independence-test
   (testing "*print-length* doesn't break rendering of long collections"
     (is (re-find #"showing page: \d+ of \d+"