[inspect] Use new stack-based view-mode

Author: alexander-yakushev

project.clj

@@ -8,7 +8,7 @@
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :scm {:name "git" :url "https://github.com/clojure-emacs/cider-nrepl"}
   :dependencies [[nrepl "1.1.1" :exclusions [org.clojure/clojure]]
-                 [cider/orchard "0.26.0" :exclusions [org.clojure/clojure]]
+                 [cider/orchard "0.26.1" :exclusions [org.clojure/clojure]]
                  ^:inline-dep [mx.cider/haystack "0.3.3" :exclusions [cider/orchard]]
                  ^:inline-dep [thunknyc/profile "0.5.2"]
                  ^:inline-dep [mvxcvi/puget "1.3.4" :exclusions [org.clojure/clojure]]

src/cider/nrepl/middleware/inspect.clj

@@ -150,7 +150,7 @@
 (defn- toggle-view-mode [{:keys [view-mode] :as inspector}]
   (let [toggle-order {:normal :object, :object :normal}
         next-view-mode (toggle-order view-mode :normal)]
-    (inspect/refresh inspector {:view-mode next-view-mode})))
+    (inspect/set-view-mode inspector next-view-mode)))
 
 (defn toggle-view-mode-reply [msg]
   (inspector-response msg (swap-inspector! msg toggle-view-mode)))

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

@@ -165,7 +165,8 @@
   (edn/read-string (first value)))
 
 (defn value-skip-header [resp]
-  (drop 7 (value resp)))
+  (drop-while #(not (and (string? %) (.startsWith ^String % "---")))
+              (value resp)))
 
 ;; integration tests
 
@@ -705,27 +706,6 @@
    [:newline]])
 
 (deftest object-view-mode-integration-test
-  (testing "object view can be enabled to render the value as POJO"
-    (is (match? (matchers/prefix object-mode-prefix)
-                (value-skip-header (session/message {:op        "eval"
-                                                     :inspect   "true"
-                                                     :view-mode "object"
-                                                     :code      "(list 1 2 3)"})))))
-
-  (testing "object view can be enabled with refresh op"
-    (session/message {:op "inspect-clear"})
-    (session/message {:op      "eval"
-                      :inspect "true"
-                      :code    "(list 1 2 3)"})
-    (is (match? (matchers/prefix object-mode-prefix)
-                (value-skip-header (session/message {:op        "inspect-refresh"
-                                                     :view-mode "object"}))))
-
-    (testing "goes back to normal when :normal view-mode is passed"
-      (is (match? (matchers/prefix normal-mode-prefix)
-                  (value-skip-header (session/message {:op        "inspect-refresh"
-                                                       :view-mode "normal"}))))))
-
   (testing "view-mode can be toggled with inspect-toggle-view-mode op"
     (session/message {:op "inspect-clear"})
     (is (match? (matchers/prefix normal-mode-prefix)
@@ -735,7 +715,19 @@
     (is (match? (matchers/prefix object-mode-prefix)
                 (value-skip-header (session/message {:op "inspect-toggle-view-mode"}))))
     (is (match? (matchers/prefix normal-mode-prefix)
-                (value-skip-header (session/message {:op "inspect-toggle-view-mode"}))))))
+                (value-skip-header (session/message {:op "inspect-toggle-view-mode"})))))
+
+  (testing "view-mode is automatically reset after navigating down"
+    (session/message {:op "inspect-clear"})
+    (session/message {:op      "eval"
+                      :inspect "true"
+                      :code    "(list 1 2 3)"})
+    (is (match? (matchers/prefix object-mode-prefix)
+                (value-skip-header (session/message {:op "inspect-toggle-view-mode"}))))
+    (is (match? (matchers/prefix ["--- Contents:" [:newline]
+                                  "  " "0" ". " [:value "2" number?] [:newline]
+                                  "  " "1" ". " [:value "3" number?] [:newline]])
+                (value-skip-header (session/message {:op "inspect-push" :idx 13}))))))
 
 (deftest print-length-independence-test
   (testing "*print-length* doesn't break rendering of long collections"