Skip to content

Commit 6be9993

Browse files
[inspect] Display :pretty in view-mode section
1 parent b443706 commit 6be9993

File tree

2 files changed

+20
-11
lines changed

2 files changed

+20
-11
lines changed

src/orchard/inspect.clj

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -973,12 +973,17 @@
973973
inspector)))
974974

975975
(defn render-view-mode [inspector]
976-
(let [view-mode (:view-mode inspector)]
977-
(if (= view-mode :normal)
976+
(let [{:keys [view-mode pretty-print]} inspector
977+
view-mode-str (->> [(when-not (= view-mode :normal)
978+
(str view-mode))
979+
(when pretty-print ":pretty")]
980+
(remove nil?)
981+
(str/join " "))]
982+
(if (str/blank? view-mode-str)
978983
inspector
979984
(-> (render-section-header inspector "View mode")
980985
(indent)
981-
(render-indent (str view-mode))
986+
(render-indent view-mode-str)
982987
(unindent)))))
983988

984989
(defn inspect-render

test/orchard/inspect_test.clj

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,9 +1590,10 @@
15901590
[:value (str "[{:a 0, :bb \"000\", :ccc [[]]}\n"
15911591
" {:a -1, :bb \"111\", :ccc [1]}\n"
15921592
" {:a 2, :bb \"222\", :ccc [1 2]}]") 8]
1593-
[:newline]]
1593+
[:newline] [:newline]]
15941594
(section "Contents" rendered))
1595-
(is (nil? (section "View mode" rendered))))))
1595+
(is+ ["--- View mode:" [:newline] " :pretty"]
1596+
(section "View mode" rendered)))))
15961597

15971598
(deftest pretty-print-map-in-object-view-test
15981599
(testing "in :object view mode + :pretty, Value: is printed regularly"
@@ -1639,9 +1640,10 @@
16391640
"\"222\", :ccc (2 1)}\n {:a -3, :bb \"333\", "
16401641
":ccc (3 2 1)}\n {:a -4, :bb \"444\", "
16411642
":ccc (4 3 2 1)})}") 2]
1642-
[:newline]]
1643+
[:newline] [:newline]]
16431644
(section "Contents" rendered))
1644-
(is (nil? (section "View mode" rendered))))))
1645+
(is+ ["--- View mode:" [:newline] " :pretty"]
1646+
(section "View mode" rendered)))))
16451647

16461648
(deftest pretty-print-map-as-key-test
16471649
(testing "in :pretty view-mode maps that contain maps as a keys are pretty printed"
@@ -1677,9 +1679,10 @@
16771679
":bb \"222\", :ccc [2 1]}\n {:a -3, :bb "
16781680
"\"333\", :ccc [3 2 1]}\n {:a -4, :bb "
16791681
"\"444\", :ccc [4 3 2 1]}]}") 2]
1680-
[:newline] [:newline]]
1682+
[:newline] [:newline] [:newline]]
16811683
(section "Contents" rendered))
1682-
(is (nil? (section "View mode" rendered))))))
1684+
(is+ ["--- View mode:" [:newline] " :pretty"]
1685+
(section "View mode" rendered)))))
16831686

16841687
(deftest pretty-print-seq-of-map-as-key-test
16851688
(testing "in :pretty view-mode maps that contain seq of maps as a keys are pretty printed"
@@ -1707,9 +1710,10 @@
17071710
"[{:a 0, :bb \"000\", :ccc [[]]}\n {:a -1, "
17081711
":bb \"111\", :ccc [1]}\n {:a 2, :bb \"222\", "
17091712
":ccc [1 2]}]}") 2]
1710-
[:newline] [:newline]]
1713+
[:newline] [:newline] [:newline]]
17111714
(section "Contents" rendered))
1712-
(is (nil? (section "View mode" rendered))))))
1715+
(is+ ["--- View mode:" [:newline] " :pretty"]
1716+
(section "View mode" rendered)))))
17131717

17141718
(deftest tap-test
17151719
(testing "tap-current-value"

0 commit comments

Comments
 (0)