Fix clean-ns with namespaced keywords

If a keyword like ::prefix/kw occurred in the file the namespace aliased
as `prefix` would be pruned.

This closes clojure-emacs/clj-refactor.el#330

Author: expez

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Bugs fixed
 
+* [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).
 
 ### New features

src/refactor_nrepl/core.clj

@@ -203,10 +203,11 @@
 (defn prefix
   "java.util.Date -> java.util
 
-  clojure.walk/walk -> clojure.walk"
+  clojure.walk/walk -> clojure.walk
+  :clojure.core/kw -> kw"
   [fully-qualified-name]
   (if(re-find #"/" (str fully-qualified-name))
-    (-> fully-qualified-name str (.split "/") first)
+    (-> fully-qualified-name str (.split "/") first (str/replace #"^:" ""))
     (let [parts (-> fully-qualified-name str (.split "\\.") butlast)]
       (when (seq parts)
         (str/join "." parts)))))
@@ -320,3 +321,8 @@
 (defn normalize-var-name
   [sym-str]
   (str/replace sym-str #"#'.*/" ""))
+
+(defn fully-qualified?
+  [symbol-or-keyword]
+  (when (prefix symbol-or-keyword)
+    symbol-or-keyword))

src/refactor_nrepl/find/symbols_in_file.clj

@@ -1,7 +1,8 @@
 (ns refactor-nrepl.find.symbols-in-file
-  (:require [clojure.tools.reader :as reader]
+  (:require [clojure
+             [walk :as walk]]
+            [clojure.tools.reader :as reader]
             [clojure.tools.reader.reader-types :as readers]
-            [clojure.walk :as walk]
             [refactor-nrepl
              [core :as core]
              [util :as util]]))
@@ -37,6 +38,11 @@
   This includes all regular symbols like foo, but also ctor calls like
   Foo. (returned as Foo), and classes used in typehints.
 
+  Note: Because it was convenient at the time this function also
+  returns fully qualified keywords mapped to symbol.  This means that
+  if the file contains `:prefix/kw` the symbol
+  `fully.resolved.prefix/kw` is included in the set.
+
   Dialect defaults to :clj."
   ([path parsed-ns] (symbols-in-file path parsed-ns :clj))
   ([path parsed-ns dialect]
@@ -55,6 +61,11 @@
                               ;; Classes used in typehints
                               (when-let [t (:tag (meta form))]
                                 (swap! syms conj t))
+                              (when (and (keyword? form)
+                                         (core/fully-qualified? form))
+                                (swap! syms conj
+                                       (symbol (core/prefix form)
+                                               (core/suffix form))))
                               form)]
          (loop [form (reader/read rdr-opts rdr)]
            (when (not= form :eof)

src/refactor_nrepl/ns/prune_dependencies.clj

@@ -4,7 +4,8 @@
              [core :as core]
              [util :as util]]
             [refactor-nrepl.find.symbols-in-file :as symbols-in-file]
-            [refactor-nrepl.config :as config]))
+            [refactor-nrepl.config :as config]
+            [refactor-nrepl.s-expressions :as sexp]))
 
 (defn- lookup-symbol-ns
   ([ns symbol]
@@ -166,3 +167,5 @@
              (prune-cljc-dependencies parsed-ns path)
              (prune-clj-or-cljs-dependencies parsed-ns path dialect))
            {:source-dialect dialect})))
+
+::sexp/foo

test/resources/ns1.clj

@@ -42,7 +42,7 @@
   (compose-fixtures)
   (clojure.test.junit/with-junit-output "")
   (escape)
-  (inst/read-instant-date)
+  ::inst/namespaced-keyword-prevents-pruning
   (clojure.data/diff)
   (clojure.edn/read-string)
   (clojure.xml/emit "")