Skip to content

Commit caad3f6

Browse files
committed
Remove pretty mode and use a config option
1 parent 7778c0b commit caad3f6

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
* [#931](https://github.com/clojure-emacs/cider-nrepl/pull/931): Redesign and optimize track-state middleware.
1010
* [#932](https://github.com/clojure-emacs/cider-nrepl/pull/932) Add support for `:pretty` view-mode in inspector.
11+
* [#932](https://github.com/clojure-emacs/cider-nrepl/pull/932) Add support for pretty printing values in the inspector.
1112

1213
## 0.55.0 (2025-04-10)
1314

src/cider/nrepl/middleware/inspect.clj

+4-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232

3333
(defn- msg->inspector-config [msg]
3434
(select-keys msg [:page-size :max-atom-length :max-coll-size
35-
:max-value-length :max-nested-depth :display-analytics-hint]))
35+
:max-value-length :max-nested-depth :display-analytics-hint
36+
:pretty-print]))
3637

3738
(defn inspect-reply* [{:keys [view-mode] :as msg} value]
3839
(let [config (msg->inspector-config msg)
@@ -80,8 +81,8 @@
8081
(defn- toggle-view-mode [{:keys [view-mode] :as inspector}]
8182
;; The order in which view modes are cycled depends on the inspected object.
8283
(let [toggle-order (if (inspect/supports-table-view-mode? inspector)
83-
{:normal :pretty, :pretty :table, :table :object, :object :normal}
84-
{:normal :pretty, :pretty :object, :object :normal})
84+
{:normal :table, :table :object, :object :normal}
85+
{:normal :object, :object :normal})
8586
next-view-mode (toggle-order view-mode :normal)]
8687
(inspect/set-view-mode inspector next-view-mode)))
8788

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

+5-11
Original file line numberDiff line numberDiff line change
@@ -653,8 +653,6 @@
653653
(value-skip-header (session/message {:op "eval"
654654
:inspect "true"
655655
:code "(list 1 2 3)"})))
656-
(is+ (matchers/prefix pretty-mode-prefix)
657-
(value-skip-header (session/message {:op "inspect-toggle-view-mode"})))
658656
(is+ (matchers/prefix object-mode-prefix)
659657
(value-skip-header (session/message {:op "inspect-toggle-view-mode"})))
660658
(is+ (matchers/prefix normal-mode-prefix)
@@ -665,8 +663,6 @@
665663
(session/message {:op "eval"
666664
:inspect "true"
667665
:code "(list 1 2 3)"})
668-
(is+ (matchers/prefix pretty-mode-prefix)
669-
(value-skip-header (session/message {:op "inspect-toggle-view-mode"})))
670666
(is+ (matchers/prefix object-mode-prefix)
671667
(value-skip-header (session/message {:op "inspect-toggle-view-mode"})))
672668
(is+ (matchers/prefix ["--- Contents:" [:newline]
@@ -699,12 +695,11 @@
699695
(session/message {:op "eval"
700696
:inspect "true"
701697
:code "(repeat 20 {:a 1})"})
702-
(session/message {:op "inspect-toggle-view-mode"})
703698
(is+ (matchers/prefix table-mode-prefix)
704699
(value-skip-header (session/message {:op "inspect-toggle-view-mode"})))))
705700

706-
(deftest pretty-view-mode-integration-test
707-
(testing "pretty view-mode renders an object with a pretty printer"
701+
(deftest pretty-print-integration-test
702+
(testing "renders an object with the pretty printer"
708703
(session/message {:op "inspect-clear"})
709704
(session/message {:op "eval"
710705
:inspect "true"
@@ -724,10 +719,9 @@
724719
[:newline]
725720
" 4. " [:value (str "{:a ({:b 2} {:b 2} {:b 2} {:b 2} {:b 2}),"
726721
"\n :c ({:d 2} {:d 2} {:d 2} {:d 2} {:d 2})}") 5]
727-
[:newline] [:newline]
728-
"--- View mode:" [:newline]
729-
" :pretty"]
730-
(value-skip-header (session/message {:op "inspect-toggle-view-mode"})))))
722+
[:newline]]
723+
(value-skip-header (session/message {:op "inspect-refresh"
724+
:pretty-print "true"})))))
731725

732726
(deftest print-length-independence-test
733727
(testing "*print-length* doesn't break rendering of long collections"

0 commit comments

Comments
 (0)