getting clean ns to maintain cursor pos

Author: Case Nelson

Diff for: .agignore

@@ -0,0 +1 @@
+/rplugin

Diff for: rplugin/node/clj-refactor.js

@@ -24,7 +24,9 @@
        last))
 
 (defn to-root [loc]
-  (exec-to loc z/up #(not (top? %))))
+  (if (top? loc)
+    loc
+    (exec-to loc z/up #(not (top? %)))))
 
 (defn parent-let? [zloc]
   (= 'let (-> zloc z/up z/leftmost z/sexpr)))
@@ -129,7 +131,6 @@
 (defn read-position
   [old-pos zloc]
   (-> zloc
-      (zdbg "read-position")
       (remove-all-after)
       (z/root-string)
       (z/of-string)
@@ -145,6 +146,6 @@
 
 (defn find-mark
   [zloc marker]
-  (if-let [mloc (z/find (to-root zloc) z/next #(= marker (get (z/node %) ::marker)))]
+  (if-let [mloc (z/find (to-root zloc) z/next (fn [loc] (= marker (get (z/node loc) ::marker))))]
     mloc
     zloc))

Diff for: src/clj_refactor/edit.cljs

@@ -51,12 +51,11 @@
                         (z/of-string)
                         (z/find-last-by-pos pos #(not= (z/tag %) :whitespace))
                         (edit/mark-position :new-cursor)
+                        ;; TODO should check if anything has changed
+                        ;; - should return nil if transformer returned nil
                         (transformer args)
                         (edit/find-mark :new-cursor)
                         (swap-position! new-cursor)
-                        (edit/zdbg (pr-str @new-cursor))
-                        ;; TODO should check if anything has changed
-                        ;; - should return nil if transformer returned nil
                         (z/root-string)
                         (parinfer/parenMode)
                         (aget "text"))]
@@ -109,7 +108,7 @@
      ;; REPL only commands
      (.command js/plugin "CAddMissingLibSpec" #js {:eval "expand('<cword>')" :nargs 0}
                (partial repl/add-missing-libspec run-transform))
-     (.command js/plugin "CCleanNS" #js {:eval "expand('%:p')" :nargs 0}
+     (.command js/plugin "CCleanNS" #js {:eval "[getpos('.'), expand('%:p')]" :nargs 0}
                (partial repl/clean-ns run-transform))
      (.command js/plugin "CRenameFile" #js {:eval "expand('%:p')" :nargs 1 :complete "file"}
                repl/rename-file)

Diff for: src/clj_refactor/main.cljs

@@ -64,7 +64,7 @@
 (defn clean-ns
   "Asks repl for the missing libspec.
   When the repl comes back with response, run transform to add to ns"
-  [run-transform nvim _ path]
+  [run-transform nvim _ [cursor path]]
   (fireplace-message
    nvim
    {:op "clean-ns" :path path :prefix-rewriting "false"}
@@ -73,7 +73,7 @@
      (let [ns-str (aget (first results) "ns")]
        (when (string? ns-str)
          (run-transform
-          transform/replace-ns nvim [(parser/parse-string ns-str)] fake-cursor))))))
+          transform/replace-ns nvim [(parser/parse-string ns-str)] cursor))))))
 
 (defn rename-file
   [nvim [new-file] current-file]

Diff for: src/clj_refactor/repl.cljs

@@ -16,11 +16,6 @@
    [rewrite-clj.zip.utils :as zu]
    [rewrite-clj.zip.whitespace :as ws]))
 
-(defn zdbg
-  [zloc]
-  (println (z/sexpr zloc))
-  zloc)
-
 (defn introduce-let
   "Adds a let around the current form."
   [zloc [binding-name]]