don't rewrite ~ @ to ~@

Author: frenchy64

src/zprint/zprint.cljc

@@ -8909,7 +8909,12 @@
       (zmeta? zloc) (fzprint-meta options indent zloc)
       (prefix-tags (ztag zloc))
         (fzprint-vec* :prefix-tags
-                      (prefix-tags (ztag zloc))
+                      (let [tag (ztag zloc)]
+                        (if (and (= :deref tag)
+                                 (z/left* zloc)
+                                 (= :unquote (some-> (z/up* zloc) ztag)))
+                          " @"
+                          (prefix-tags tag)))
                       ""
                       ; Pick up the :indent-only?, :respect-nl?, and
                       ; respect-bl? config from :list. Note that the

test/zprint/zprint_test.cljc

@@ -3379,12 +3379,27 @@
   (expect "'(a b c)" (zprint-str "'(a b c)" {:parse-string? true}))
   (expect "`(a b c)" (zprint-str "`(a b c)" {:parse-string? true}))
   (expect "~(a b c)" (zprint-str "~(a b c)" {:parse-string? true}))
-  (expect "~@(a b c)" (zprint-str "~@(a b c)" {:parse-string? true}))
   (expect "@(a b c)" (zprint-str "@(a b c)" {:parse-string? true}))
   (expect "#'thisisatest" (zprint-str "#'thisisatest" {:parse-string? true}))
   (expect "#_(a b c)" (zprint-str "#_(a b c)" {:parse-string? true}))
   (expect "#_#_(a b c) d" (zprint-str "#_#_(a b c) d" {:parse-string? true}))
 
+  ;; unquote deref vs unquote-splicing
+  (expect "(clojure.core/unquote (clojure.core/deref (a b c)))"
+          (zprint-str '~ @(a b c) {}))
+  (expect "(clojure.core/unquote-splicing (a b c))"
+          (zprint-str '~@(a b c) {}))
+  (expect "~(deref a)" (zprint-str "~(deref a)" {:parse-string? true}))
+  (expect "~(clojure.core/deref a)" (zprint-str "~(clojure.core/deref a)" {:parse-string? true}))
+  (expect "~;;comment\n  @(a b c)" (zprint-str "~;;comment\n@(a b c)" {:parse-string? true}))
+  (expect "~@(a b c)" (zprint-str "~@(a b c)" {:parse-string? true}))
+  (expect "~ @(a b c)" (zprint-str "~ @(a b c)" {:parse-string? true}))
+  (expect "~ @(a b c)" (zprint-str "~  @(a b c)" {:parse-string? true}))
+  (expect "~ @(a b c)" (zprint-str "~ @(a b c)" {:parse-string? true}))
+  (expect "~#_@(a b c) a" (zprint-str "~#_@(a b c)a" {:parse-string? true}))
+  (expect "~#_a  @(a b c)" (zprint-str "~#_a@(a b c)" {:parse-string? true}))
+  (expect "[#_a @(a b c)]" (zprint-str "[#_a@(a b c)]" {:parse-string? true}))
+
   ;;
   ;; These try for the indents
   ;;