Skip to content

Commit b443706

Browse files
[inspect] Don't pretty-print Value: in object-view mode
1 parent c28428b commit b443706

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

src/orchard/inspect.clj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,11 @@
770770
(shorten-member-string (str obj) (.getDeclaringClass ^Method obj))
771771

772772
(instance? Field obj)
773-
(shorten-member-string (str obj) (.getDeclaringClass ^Field obj)))]
773+
(shorten-member-string (str obj) (.getDeclaringClass ^Field obj))
774+
775+
;; Using print-str and not pprint intentionally, so that the
776+
;; `Value:` remains on a single line.
777+
:else (print/print-str obj))]
774778
(letfn [(render-fields [inspector section-name field-values]
775779
(if (seq field-values)
776780
(-> inspector

test/orchard/inspect_test.clj

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1595,7 +1595,7 @@
15951595
(is (nil? (section "View mode" rendered))))))
15961596

15971597
(deftest pretty-print-map-in-object-view-test
1598-
(testing "in :pretty view-mode are pretty printed"
1598+
(testing "in :object view mode + :pretty, Value: is printed regularly"
15991599
(let [rendered (-> {:a 0
16001600
:bb "000"
16011601
:ccc []
@@ -1607,16 +1607,8 @@
16071607
(set-pretty-print true)
16081608
render)]
16091609
(is+ ["Value: "
1610-
[:value (str "{:a 0,\n"
1611-
" :bb \"000\",\n"
1612-
" :ccc [],\n"
1613-
" :d\n"
1614-
" [{:a 0, :bb \"000\", :ccc [[]]}\n"
1615-
" {:a -1, :bb \"111\", :ccc [1]}\n"
1616-
" {:a 2, :bb \"222\", :ccc [1 2]}]}") 1]]
1617-
(labeled-value "Value" rendered))
1618-
(is+ ["--- View mode:" [:newline] " :object"]
1619-
(section "View mode" rendered)))))
1610+
[:value "{:a 0, :bb \"000\", :ccc [], :d [{:a 0, :bb \"000\", :ccc [[]]} {:a -1, :bb \"111\", :ccc [1]} {:a 2, :bb \"222\", :ccc [1 2]}]}" 1]]
1611+
(labeled-value "Value" rendered)))))
16201612

16211613
(deftest pretty-print-seq-of-maps-test
16221614
(testing "in :pretty view-mode maps seqs of maps are pretty printed"

0 commit comments

Comments
 (0)