[inspect] Add support for sort-maps and diff view

Author: alexander-yakushev

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## master (unreleased)
 
+* Bump `orchard` to [0.36.0](https://github.com/clojure-emacs/orchard/blob/master/CHANGELOG.md#0360-2025-06-29).
+
 ## 0.56.0 (2025-05-29)
 
 * Bump `orchard` to [0.35.0](https://github.com/clojure-emacs/orchard/blob/master/CHANGELOG.md#0350-2025-05-28).

doc/modules/ROOT/pages/nrepl-api/ops.adoc

@@ -631,7 +631,10 @@ Optional parameters::
 * `:max-atom-length` New max length of single rendered value
 * `:max-coll-size` New max size of rendered collection
 * `:max-nested-depth` New max nested depth of rendered collection
+* `:only-diff` Set to true to only display values that differ when inspecting a diff
 * `:page-size` New page size
+* `:pretty-print` Set to true to pretty-print values within the inspector
+* `:sort-maps` Set to true to sort maps by their keys when inspecting a map
 * `:view-mode` Mode of viewing the value - either ``:normal`` or ``:object``
 
 

project.clj

@@ -21,7 +21,7 @@
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :scm {:name "git" :url "https://github.com/clojure-emacs/cider-nrepl"}
   :dependencies [[nrepl/nrepl "1.3.1" :exclusions [org.clojure/clojure]]
-                 [cider/orchard "0.35.0" :exclusions [org.clojure/clojure]]
+                 [cider/orchard "0.36.0" :exclusions [org.clojure/clojure]]
                  ^:inline-dep [compliment "0.7.0"]
                  ^:inline-dep [org.rksm/suitable "0.6.2" :exclusions [org.clojure/clojure
                                                                       org.clojure/clojurescript]]

src/cider/nrepl.clj

@@ -344,7 +344,10 @@ if applicable, and re-render the updated value."
                           "max-atom-length" "New max length of single rendered value"
                           "max-coll-size" "New max size of rendered collection"
                           "max-nested-depth" "New max nested depth of rendered collection"
-                          "view-mode" "Mode of viewing the value - either `:normal` or `:object`"}
+                          "view-mode" "Mode of viewing the value - either `:normal` or `:object`"
+                          "pretty-print" "Set to true to pretty-print values within the inspector"
+                          "sort-maps" "Set to true to sort maps by their keys when inspecting a map"
+                          "only-diff" "Set to true to only display values that differ when inspecting a diff"}
                :returns inspector-returns}
               "inspect-toggle-pretty-print"
               {:doc "Toggles the pretty printing of values in the inspector."

src/cider/nrepl/middleware/inspect.clj

@@ -33,11 +33,16 @@
                  :path (pr-str (seq (:path inspector)))})]
      (response-for msg data extra-response-data))))
 
+(defn- booleanize [m keys]
+  (reduce (fn [m k] (cond-> m
+                      (contains? m k) (update k = "true")))
+          m keys))
+
 (defn- msg->inspector-config [msg]
   (-> (select-keys msg [:page-size :max-atom-length :max-coll-size
                         :max-value-length :max-nested-depth :display-analytics-hint
-                        :pretty-print])
-      (update :pretty-print #(= "true" %))))
+                        :pretty-print :sort-maps :only-diff])
+      (booleanize [:pretty-print :sort-maps :only-diff])))
 
 (defn inspect-reply* [{:keys [view-mode] :as msg} value]
   (let [config (msg->inspector-config msg)

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

@@ -75,7 +75,14 @@
    "  ●normal object pretty"])
 
 (defn value [{:keys [value]}]
-  (edn/read-string (first value)))
+  (->> (edn/read-string (first value))
+       ;; Merge strings
+       (reduce (fn [acc x]
+                 (let [lst (peek acc)]
+                   (if (and (string? x) (string? lst))
+                     (conj (pop acc) (str lst x))
+                     (conj acc x))))
+               [])))
 
 (defn value-skip-header [resp]
   (drop-while #(not (and (string? %) (.startsWith ^String % "---")))
@@ -524,7 +531,7 @@
                                  "\n      :c ({:d 2} {:d 2} {:d 2} {:d 2} {:d 2} {:d 2})}") 5]
             [:newline] [:newline]
             #"--- View mode" [:newline]
-            "  ●normal table object ●pretty"]
+            "  ●normal table object ●pretty sort-maps"]
            (value-skip-header (session/message {:op "inspect-toggle-pretty-print"}))))
     (testing "toggle pretty printing and turn it off"
       (is+ ["--- Contents:" [:newline]
@@ -544,7 +551,7 @@
                                  " :c ({:d 2} {:d 2} {:d 2} {:d 2} {:d 2} {:d 2})}") 5]
             [:newline] [:newline]
             #"--- View mode" [:newline]
-            "  ●normal table object pretty"]
+            "  ●normal table object pretty sort-maps"]
            (value-skip-header (session/message {:op "inspect-toggle-pretty-print"}))))))
 
 (deftest print-length-independence-test

test/clj/cider/nrepl/middleware/profile_test.clj

@@ -33,7 +33,7 @@
     (is+ {:status #{"done"}
           :value [(mc/via read-string
                           (mc/prefix ["Class: " [:value "clojure.lang.ArraySeq" 0] [:newline]
-                                      "Count: 1" [:newline] [:newline]
+                                      "Count: " "1" [:newline] [:newline]
                                       "--- Contents:" [:newline] [:newline]]))]}
          (session/message {:op "cider/profile-summary"}))))
 

test/cljs/cider/nrepl/middleware/cljs_inspect_test.clj

@@ -33,7 +33,14 @@
    "  34. " [:value "34" 3]])
 
 (defn value [{:keys [value]}]
-  (edn/read-string (first value)))
+  (->> (edn/read-string (first value))
+       ;; Merge strings
+       (reduce (fn [acc x]
+                 (let [lst (peek acc)]
+                   (if (and (string? x) (string? lst))
+                     (conj (pop acc) (str lst x))
+                     (conj acc x))))
+               [])))
 
 ;; integration tests