Fix :as-alias handling for .cljc files

Author: vemv

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 3.5.2
+
+* [#378](https://github.com/clojure-emacs/refactor-nrepl/issues/378): Fix `:as-alias` handling for .cljc files.
+
 ## 3.5.1
 
 * Refine `:as-alias` detection.

README.md

@@ -26,7 +26,7 @@ Be aware that this isn't the case if you connect to an already running REPL proc
 Add the following, either in your project's `project.clj`,  or in the `:user` profile found at `~/.lein/profiles.clj`:
 
 ```clojure
-:plugins [[refactor-nrepl "3.5.1"]
+:plugins [[refactor-nrepl "3.5.2"]
           [cider/cider-nrepl "0.28.3"]]
 ```
 
@@ -360,12 +360,12 @@ If you want to use `mranderson` while developing locally with the REPL, the sour
 
 When you want to release locally to the following:
 
-    PROJECT_VERSION=3.5.1 make install
+    PROJECT_VERSION=3.5.2 make install
 
 And here's how to deploy to Clojars:
 
 ```bash
-git tag -a v3.5.1 -m "3.5.1"
+git tag -a v3.5.2 -m "3.5.2"
 git push --tags
 ```
 

src/refactor_nrepl/find/symbols_in_file.clj

@@ -68,7 +68,7 @@
                  reader/*data-readers* (merge (when (= dialect :cljs)
                                                 {'js identity})
                                               *data-readers*)
-                 clojure.tools.reader/*alias-map* ns-aliases]
+                 reader/*alias-map* ns-aliases]
          (let [rdr (-> path slurp core/file-content-sans-ns
                        readers/indexing-push-back-reader)
                rdr-opts {:read-cond :allow :features #{dialect} :eof :eof}
@@ -98,7 +98,6 @@
                (when (not= form :eof)
                  (walk/prewalk collect-symbols form)
                  (recur (reader/read rdr-opts rdr))))
-             (->> @syms
-                  (map
-                   (partial fix-ns-of-backquoted-symbols (dialect parsed-ns)))
-                  set))))))))
+             (into #{}
+                   (map (partial fix-ns-of-backquoted-symbols (dialect parsed-ns)))
+                   @syms))))))))

src/refactor_nrepl/ns/ns_parser.clj

@@ -148,8 +148,8 @@
   e.g {str clojure.string}"
   [libspecs]
   (->> libspecs
-       (map (fn alias [{:keys [ns as]}]
-              (when as
-                {as ns})))
-       (remove nil?)
+       (keep (fn alias [{:keys [ns as as-alias]}]
+               (cond-> {}
+                 as (assoc as ns)
+                 as-alias (assoc as-alias ns))))
        (apply merge)))

test-resources/clean_ns/as_alias.cljc

@@ -0,0 +1,6 @@
+(ns as-alias
+  (:require
+   [foo :as-alias f]
+   [unused :as-alias clean-me-up]))
+
+(def bar ::f/bar)

test/refactor_nrepl/ns/clean_ns_test.clj

@@ -176,12 +176,11 @@
      (:import java.util.Date)))
 
 (deftest test-pprint-artifact-ns
-  (are [setting filename]
-       (let [actual (config/with-config {:insert-newline-after-require setting}
-                      (pprint-ns (with-meta artifact-ns nil)))
-             expected (-> filename File. .getAbsolutePath slurp)]
-         (is (= expected actual))
-         true)
+  (are [setting filename] (let [actual (config/with-config {:insert-newline-after-require setting}
+                                         (pprint-ns (with-meta artifact-ns nil)))
+                                expected (-> filename File. .getAbsolutePath slurp)]
+                            (is (= expected actual))
+                            true)
     true  "test-resources/artifacts_pprinted"
     false "test-resources/artifacts_pprinted_traditional_newline"))
 
@@ -269,3 +268,8 @@
 (deftest npm-string-sorting
   (is (= (pprint-ns (clean-ns ns-with-npm-strs))
          (pprint-ns (read-string (slurp (:path ns-with-npm-strs-clean)))))))
+
+(core/with-clojure-version->= {:major 1 :minor 11}
+  (deftest as-alias
+    (is (= '(ns as-alias (:require [foo :as-alias f]))
+           (clean-ns (clean-msg "test-resources/clean_ns/as_alias.cljc"))))))