rename-file-or-dir: rename more kinds of constructs in dependent namespaces (#365)

* `rename-file-or-dir`: rename more kinds of constructs in dependent namespaces

Fixes #173

Author: vemv

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+* [#173](https://github.com/clojure-emacs/refactor-nrepl/issues/173): `rename-file-or-dir`: rename more kinds of constructs in dependent namespaces: namespace-qualified maps, fully-qualified functions, metadata.
+
 ## 3.3.1
 
 * [#363](https://github.com/clojure-emacs/refactor-nrepl/issues/363): Fix a memoization bug in `clean-namespace`.

src/refactor_nrepl/rename_file_or_dir.clj

@@ -89,7 +89,7 @@
   (let [dialect (:source-dialect parsed-ns)
         libspecs (-> parsed-ns dialect :require)
         require-macros (-> parsed-ns :cljs :require-macros)
-        classes (->  parsed-ns dialect :import)]
+        classes (-> parsed-ns dialect :import)]
     (merge parsed-ns
            {dialect
             (merge {:require (update-libspecs libspecs old-ns new-ns)
@@ -108,16 +108,18 @@
 (defn- update-file-content-sans-ns
   "Any fully qualified references to old-ns has to be replaced with new-ns."
   [file old-ns new-ns]
-  (let [old-prefix (str (str/replace old-ns "-" "_") "/")
-        new-prefix (str (str/replace new-ns "-" "_") "/")
-        old-ns-ref (str old-ns "/")
-        new-ns-ref (str new-ns "/")]
-    (-> file
-        slurp
-        core/file-content-sans-ns
-        str/triml
-        (str/replace old-prefix new-prefix)
-        (str/replace old-ns-ref new-ns-ref))))
+  (let [replacements {(str/replace old-ns "-" "_") (str/replace new-ns "-" "_")
+                      (str old-ns "/")             (str new-ns "/")
+                      (str "#:" old-ns "{")        (str "#:" new-ns "{")
+                      (str "#:" old-ns " {")       (str "#:" new-ns " {")}
+        content (-> file
+                    slurp
+                    core/file-content-sans-ns
+                    str/triml)]
+    (reduce (fn [s [old new]]
+              (str/replace s old new))
+            content
+            replacements)))
 
 (defn- update-dependent
   "New content for a dependent file."

test/refactor_nrepl/rename_file_or_dir_test.clj

@@ -1,6 +1,7 @@
 (ns refactor-nrepl.rename-file-or-dir-test
   (:require
-   [clojure.test :refer [deftest is]]
+   [clojure.string :as string]
+   [clojure.test :refer [deftest is testing]]
    [refactor-nrepl.core :refer [get-ns-component ns-form-from-string]]
    [refactor-nrepl.rename-file-or-dir :as sut]
    [refactor-nrepl.unreadable-files :refer [ignore-errors?]])
@@ -48,7 +49,12 @@
                     imported-ns (-> import-form second first)]]
         (is (= 'com.move.moved-ns required-ns))
         (when imported-ns
-          (is (= 'com.move.moved_ns imported-ns)))))))
+          (is (= 'com.move.moved_ns imported-ns)))
+        (testing content
+          (is (not (string/includes? content "ns-to-be-moved"))
+              "Renames various types of constructs (metadata, ns-qualified maps, etc)")
+          (is (not (string/includes? content "ns_to_be_moved"))
+              "Renames emitted class references"))))))
 
 (deftest replaces-fully-qualified-vars-in-dependents
   (let [dependents (atom [])]

testproject/src/com/move/dependent_ns1.clj

@@ -5,6 +5,22 @@
             TypeToBeMoved RecordToBeMoved]))
 
 (defn- use-some-publics []
+
+  (com.move.ns-to-be-moved/fn-to-be-moved :_)
+
+  'com.move.ns-to-be-moved/fn-to-be-moved
+
+  #'com.move.ns-to-be-moved/fn-to-be-moved
+
+  ^:com.move.ns-to-be-moved/fn-to-be-moved []
+
+  #:com.move.ns-to-be-moved {:a :b}
+
+  (let [^com.move.ns_to_be_moved.TypeToBeMoved x (fn-to-be-moved :_)]
+    x)
+
+  (com.move.ns_to_be_moved.TypeToBeMoved. :ok)
+
   (macro-to-be-moved
    (fn-to-be-moved (TypeToBeMoved. :ok))
    (fn-to-be-moved (RecordToBeMoved. :ok))))