[Fix #362] clean-ns: Preserve all shorthand style metadata

Author: benedekfazekas

CHANGELOG.md

@@ -11,6 +11,7 @@
 * [clojure-emacs/clj-refactor.el#330](https://github.com/clojure-emacs/clj-refactor.el/issues/332) `clean-ns` removes imported inner inner classes.
 * [clojure-emacs/clj-refactor.el#330](https://github.com/clojure-emacs/clj-refactor.el/issues/330) `clean-ns` ignores namespaced keywords.
 * [#160](https://github.com/clojure-emacs/refactor-nrepl/issues/160) Make `resolve-missing` find newly defined vars and types (clj). Because of a stale cache, newly added vars or types would not be found. This fix takes into account vars/types added by eval-ing code (rescan affected namespace), and by hotloading dependencies (reset the cache).
+* [#362](https://github.com/clojure-emacs/refactor-nrepl/issues/362) Preserve all shorthand style metadata when `clean-ns` is used.
 
 ### Changes
 

src/refactor_nrepl/core.clj

@@ -261,10 +261,10 @@
                   (PushbackReader.)
                   parse/read-ns-decl
                   second)
-        shorthand-meta?  (second (re-find #"\^:([^\s]+)\s" ns-string))]
+        shorthand-meta?  (re-seq #"\^:([^\s]+)\s" ns-string)]
     (cond
       (map? meta?) meta?
-      shorthand-meta? {::shorthand-meta (keyword shorthand-meta?)}
+      shorthand-meta? {::shorthand-meta-coll (map (comp keyword second) shorthand-meta?)}
       :else nil)))
 
 (defn read-ns-form-with-meta

src/refactor_nrepl/ns/pprint.clj

@@ -78,8 +78,9 @@
 
 (defn pprint-meta
   [m]
-  (if-let [shorthand-meta (::core/shorthand-meta m)]
-    (print (str "^" shorthand-meta " "))
+  (if-let [shorthand-meta-coll (::core/shorthand-meta-coll m)]
+    (doseq [shorthand-meta shorthand-meta-coll]
+      (print (str "^" shorthand-meta " ")))
     (printf (.replaceAll (str "^" (into (sorted-map) m) "\n")
                          ", " "\n"))))
 

test/refactor_nrepl/ns/clean_ns_test.clj

@@ -39,6 +39,8 @@
 
 (def ns-with-shorthand-meta (clean-msg "test/resources/ns_with_shorthand_meta.clj"))
 
+(def ns-with-multiple-shorthand-meta (clean-msg "test/resources/ns_with_multiple_shorthand_meta.clj"))
+
 (deftest combines-requires
   (let [requires (core/get-ns-component (clean-ns ns2) :require)
         combined-requires (core/get-ns-component ns2-cleaned :require)]
@@ -192,3 +194,8 @@
 (deftest preserves-shorthand-meta
   (let [cleaned (pprint-ns (clean-ns ns-with-shorthand-meta))]
     (is (re-find #"\^:automation" cleaned))))
+
+(deftest preservres-multiple-shortand-meta
+  (let [cleaned (pprint-ns (clean-ns ns-with-multiple-shorthand-meta))]
+    (is (re-find #"\^:automation" cleaned))
+    (is (re-find #"\^:multiple" cleaned))))

test/resources/ns_with_multiple_shorthand_meta.clj

@@ -0,0 +1,2 @@
+(ns ^:automation ^:multiple ns-with-multiple-shorthand-meta
+  (:require [clojure.string]))