Clean up new rename.

Author: tcrayford

src/clojure_refactoring/ast/zip.clj

@@ -17,7 +17,8 @@
       zip/path))
 
 (defn zip-walk [zipper f]
-  "Performs a depth first walk over zipper, calling f on each sub-node."
+  "Performs a depth first walk over zipper, calling a function
+   on each sub-node."
   (loop [loc zipper]
     (if (zip/end? loc)
       (zip/root loc)

src/clojure_refactoring/rename.clj

@@ -20,19 +20,19 @@
      (rename-in-ast ast old new))))
 
 (defn rename-node [loc new-name]
-  (if ((bindings-above-loc loc) (zip/node loc))
+  (if ((bindings-above loc) (zip/node loc))
     loc
     (zip/replace loc (ast/symbol new-name))))
 
-(defn rename-non-shadowed-in-ast [new-sym node old-name]
+(defn rename-non-shadowed [new-sym node old-name]
   (zip-walk (ast-zip node)
             #(if (= (zip/node %) (ast/symbol old-name))
                (rename-node % new-sym) %)))
 
 (defn renaming-fn [old-var new-sym]
   "Returns a function for renaming nodes"
   (fn [node]
-    (rename-non-shadowed-in-ast new-sym node (.sym old-var))))
+    (rename-non-shadowed new-sym node (.sym old-var))))
 
 (defn global-rename [ns old-name new-name]
   "Sends a list of alists to emacs for processing as renames."

src/clojure_refactoring/support/find_bindings_above_node.clj

@@ -15,12 +15,12 @@
        ast/sub-nodes
        (filter ast/symbol?)))
 
-(defn bindings-above-loc [loc]
+(defn bindings-above [loc]
   (->> (zip/path loc)
        (filter ast/binding-node?)
        (mapcat extract-symbols-from-binding-node)
        set))
 
 (defn find-bindings-above-node [node expr]
   (->> (find-node (ast-zip node) expr)
-       bindings-above-loc))
+       bindings-above))