[inspect] Enable hex-mode for byte arrays by default

Author: alexander-yakushev

src/orchard/inspect.clj

@@ -23,7 +23,7 @@
 ;; Navigating Inspector State
 ;;
 
-(declare inspect-render)
+(declare inspect-render supported-view-modes)
 
 (defn push-item-to-path
   "Takes `path` and the role and key of the value to be navigated to, and returns
@@ -177,16 +177,16 @@
         ;; :current-page may be wrong, recompute it.
         current-page (if (number? child-key)
                        (quot child-key page-size)
-                       current-page)]
-    (-> inspector
-        (assoc :value child)
-        (dissoc :value-analysis)
-        (update :stack conj value)
-        (assoc :current-page 0)
-        (update :pages-stack conj current-page)
-        (assoc :view-mode :normal)
-        (update :view-modes-stack conj view-mode)
-        (update :path push-item-to-path child-role child-key))))
+                       current-page)
+        ins (-> inspector
+                (assoc :value child)
+                (dissoc :value-analysis)
+                (update :stack conj value)
+                (assoc :current-page 0)
+                (update :pages-stack conj current-page)
+                (update :view-modes-stack conj view-mode)
+                (update :path push-item-to-path child-role child-key))]
+    (assoc ins :view-mode (first (supported-view-modes ins)))))
 
 (defn down
   "Drill down to an indexed object referred to by the previously rendered value."
@@ -290,7 +290,7 @@
 
 ;; View modes
 
-(def ^:private view-mode-order [:normal :hex :table :object])
+(def ^:private view-mode-order [:hex :normal :table :object])
 
 (defmulti view-mode-supported? (fn [_inspector view-mode] view-mode))
 
@@ -318,10 +318,13 @@
   (pre-ex (view-mode-supported? inspector mode))
   (inspect-render (assoc inspector :view-mode mode)))
 
+(defn- supported-view-modes [inspector]
+  (filter #(view-mode-supported? inspector %) view-mode-order))
+
 (defn toggle-view-mode
   "Switch to the next supported view mode."
   [{:keys [view-mode] :as inspector}]
-  (let [supported (filter #(view-mode-supported? inspector %) view-mode-order)
+  (let [supported (supported-view-modes inspector)
         transitions (zipmap supported (rest (cycle supported)))]
     (set-view-mode inspector (transitions view-mode))))
 
@@ -1116,11 +1119,13 @@
   of supported keys."
   ([value] (start {} value))
   ([config value]
-   (-> default-inspector-config
-       (merge (validate-config config))
-       (assoc :stack [], :path [], :pages-stack [], :current-page 0,
-              :view-modes-stack [], :view-mode :normal, :value value)
-       (inspect-render))))
+   (let [inspector (-> default-inspector-config
+                       (merge (validate-config config))
+                       (assoc :stack [], :path [], :pages-stack [], :current-page 0,
+                              :view-modes-stack [], :value value))]
+     (-> inspector
+         (assoc :view-mode (first (supported-view-modes inspector)))
+         inspect-render))))
 
 (defn ^:deprecated clear
   "If necessary, use `(start inspector nil) instead.`"

test/orchard/inspect_test.clj

@@ -560,7 +560,7 @@
                   :value))))
   (testing "sibling functions work with arrays"
     (is+ {:value 35, :pages-stack [1], :path '[(nth 35)]}
-         (-> (byte-array (range 40))
+         (-> (long-array (range 40))
              inspect
              (inspect/down 33)
              (inspect/next-sibling)
@@ -1527,7 +1527,7 @@
             "  0x00000050 │ 50 51 52 53 54 55 56 57  58 59 5a 5b 5c 5d 5e 5f │ PQRSTUVWXYZ[\\]^_" [:newline]
             "  0x00000060 │ 60 61 62 63                                      │ `abc"]
            (contents-section rendered))
-      (is+ [#"--- View mode" [:newline] "  normal ●hex object pretty"]
+      (is+ [#"--- View mode" [:newline] "  ●hex normal object pretty"]
            (section rendered "View mode"))))
 
   (testing "works with paging"
@@ -1553,7 +1553,25 @@
              (set-page-size 2)
              inspect/next-page
              render
-             contents-section))))
+             contents-section))
+
+    (testing "enabled by default for byte arrays"
+      (is+ (matchers/prefix
+            ["--- Contents:" [:newline]
+             "  0x00000000 │ 00 01 02 03 04 05 06 07  08 09 0a 0b 0c 0d 0e 0f │ ················"])
+           (-> (byte-array (range 100))
+               inspect
+               render
+               contents-section))
+
+      (is+ (matchers/prefix
+            ["--- Contents:" [:newline]
+             "  0x00000000 │ 00 01 02 03 04 05 06 07  08 09 0a 0b 0c 0d 0e 0f │ ················"])
+           (-> [(byte-array (range 100))]
+               inspect
+               (inspect/down 1)
+               render
+               contents-section)))))
 
 (deftest toggle-view-mode-test
   (is+ :normal (-> (repeat 10 [1 2]) inspect :view-mode))