pprint maps with namespace map literal syntax when *print-namespace-maps*

Signed-off-by: Rich Hickey <richhickey@gmail.com>

Author: puredanger

src/clj/clojure/core_print.clj

@@ -233,26 +233,25 @@
 (defn- lift-ns
   "Returns [lifted-ns lifted-map] or nil if m can't be lifted."
   [m]
-  (loop [ns nil
-         [[k v :as entry] & entries] (seq m)
-         lm (empty m)]
-    (if entry
-      (when (or (keyword? k) (symbol? k))
-        (if ns
-          (when (= ns (namespace k))
-            (recur ns entries (assoc lm (strip-ns k) v)))
-          (when-let [new-ns (namespace k)]
-            (recur new-ns entries (assoc lm (strip-ns k) v)))))
-      [ns lm])))
+  (when *print-namespace-maps*
+    (loop [ns nil
+           [[k v :as entry] & entries] (seq m)
+           lm (empty m)]
+      (if entry
+        (when (or (keyword? k) (symbol? k))
+          (if ns
+            (when (= ns (namespace k))
+              (recur ns entries (assoc lm (strip-ns k) v)))
+            (when-let [new-ns (namespace k)]
+              (recur new-ns entries (assoc lm (strip-ns k) v)))))
+        [ns lm]))))
 
 (defmethod print-method clojure.lang.IPersistentMap [m, ^Writer w]
   (print-meta m w)
-  (if *print-namespace-maps*
-    (let [[ns lift-map] (lift-ns m)]
-      (if ns
-        (print-prefix-map (str "#:" ns) lift-map pr-on w)
-        (print-map m pr-on w)))
-    (print-map m pr-on w)))
+  (let [[ns lift-map] (lift-ns m)]
+    (if ns
+      (print-prefix-map (str "#:" ns) lift-map pr-on w)
+      (print-map m pr-on w))))
 
 (defmethod print-dup java.util.Map [m, ^Writer w]
   (print-ctor m #(print-map (seq %1) print-dup %2) w))

src/clj/clojure/pprint/dispatch.clj

@@ -92,19 +92,23 @@
 
 ;;; (def pprint-map (formatter-out "~<{~;~@{~<~w~^ ~_~w~:>~^, ~_~}~;}~:>"))
 (defn- pprint-map [amap]
-  (pprint-logical-block :prefix "{" :suffix "}"
-    (print-length-loop [aseq (seq amap)]
-      (when aseq
-	(pprint-logical-block 
-          (write-out (ffirst aseq))
-          (.write ^java.io.Writer *out* " ")
-          (pprint-newline :linear)
-          (set! *current-length* 0)     ; always print both parts of the [k v] pair
-          (write-out (fnext (first aseq))))
-        (when (next aseq)
-          (.write ^java.io.Writer *out* ", ")
-          (pprint-newline :linear)
-          (recur (next aseq)))))))
+  (let [[ns lift-map] (when (not (record? amap))
+                        (#'clojure.core/lift-ns amap))
+        amap (or lift-map amap)
+        prefix (if ns (str "#:" ns "{") "{")]
+    (pprint-logical-block :prefix prefix :suffix "}"
+      (print-length-loop [aseq (seq amap)]
+        (when aseq
+          (pprint-logical-block
+            (write-out (ffirst aseq))
+            (.write ^java.io.Writer *out* " ")
+            (pprint-newline :linear)
+            (set! *current-length* 0) ; always print both parts of the [k v] pair
+            (write-out (fnext (first aseq))))
+          (when (next aseq)
+            (.write ^java.io.Writer *out* ", ")
+            (pprint-newline :linear)
+            (recur (next aseq))))))))
 
 (def ^{:private true} pprint-set (formatter-out "~<#{~;~@{~w~^ ~:_~}~;}~:>"))