[Fix #192] Clean ns understands $ as a symbol

Author: benedekfazekas

CHANGELOG.md

@@ -12,6 +12,7 @@
 * [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).
 * [clojure-emacs/clj-refactor.el#362](https://github.com/clojure-emacs/clj-refactor.el/issues/362) Preserve all shorthand style metadata when `clean-ns` is used.
+* [#192](https://github.com/clojure-emacs/refactor-nrepl/issues/192) Clean ns understands `$` as a symbol. Specially this enables clean ns to work with incanter that does have function named `$`.
 
 ### Changes
 

project.clj

@@ -21,7 +21,8 @@
   :filespecs [{:type :bytes :path "refactor-nrepl/refactor-nrepl/project.clj" :bytes ~(slurp "project.clj")}]
   :profiles {:provided {:dependencies [[cider/cider-nrepl "0.10.0"]
                                        [org.clojure/clojure "1.7.0"]]}
-             :test {:dependencies [[print-foo "1.0.1"]]
+             :test {:dependencies [[print-foo "1.0.1"]
+                                   [incanter/incanter-core "1.5.7"]]
                     :src-paths ["test/resources"]}
              :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}
              :1.9 {:dependencies [[org.clojure/clojure "1.9.0-alpha14"]

src/refactor_nrepl/core.clj

@@ -236,7 +236,7 @@
       (= "/" fully-qualified-name)
       fully-qualified-name
 
-      (re-find #"\$" fully-qualified-name)
+      (re-find #"\w\$\w" fully-qualified-name)
       (let [[outer & classes] (-> fully-qualified-name (.split "\\$"))
             outer (suffix outer)]
         (if (> (count classes) 1)

test/refactor_nrepl/ns/clean_ns_test.clj

@@ -41,6 +41,8 @@
 
 (def ns-with-multiple-shorthand-meta (clean-msg "test/resources/ns_with_multiple_shorthand_meta.clj"))
 
+(def ns-with-incanter (clean-msg "test/resources/ns_with_incanter.clj"))
+
 (deftest combines-requires
   (let [requires (core/get-ns-component (clean-ns ns2) :require)
         combined-requires (core/get-ns-component ns2-cleaned :require)]
@@ -199,3 +201,7 @@
   (let [cleaned (pprint-ns (clean-ns ns-with-multiple-shorthand-meta))]
     (is (re-find #"\^:automation" cleaned))
     (is (re-find #"\^:multiple" cleaned))))
+
+(deftest does-not-remove-dollar-sign-if-valid-symbol
+  (let [cleaned (pprint-ns (clean-ns ns-with-incanter))]
+    (is (re-find #"\[\$\]" cleaned))))