Refactor find-symbol

Author: expez

src/refactor_nrepl/client.clj

@@ -179,7 +179,7 @@
                                   :ns-string ns-string
                                   :debug-fns debug-fns})
         invocations (-> result first :value)]
-    (when-not (empty? invocations)
+    (when (seq invocations)
       (->> ns-string
            str/split-lines
            (remove-invocations

src/refactor_nrepl/find/find_symbol.clj

@@ -57,7 +57,8 @@
                    (comp :end-line :env)
                    (comp :column :env)
                    (comp :end-column :env)
-                   pred))))
+                   pred))
+        (map #(zipmap [:line-beg :line-end :col-beg :col-end] %))))
   ([name asts pred]
    (find-nodes (map #(postwalk % (partial dissoc-macro-nodes name)) asts) pred)))
 
@@ -111,17 +112,18 @@
   (let [file-content (slurp file)
         locs (try (->> (ns-ast file-content)
                        (find-symbol-in-ast fully-qualified-name)
-                       (filter first))
-                  (catch Throwable th
+                       (filter :line-beg))
+                  (catch Exception e
                     (when-not ignore-errors
-                      (throw th))))
+                      (throw e))))
         gather (fn [info]
-                 (conj info
-                       (.getCanonicalPath file)
-                       (match file-content
-                         (first info)
-                         (second info))))]
-    (when (seq locs) (map gather locs))))
+                 (merge info
+                        {:file (.getCanonicalPath file)
+                         :name fully-qualified-name
+                         :match (match file-content
+                                  (:line-beg info)
+                                  (:line-end  info))}))]
+    (map gather locs)))
 
 (defn- find-global-symbol [file ns var-name clj-dir ignore-errors]
   (let [dir (or clj-dir ".")
@@ -158,31 +160,32 @@
                                 (filter (partial util/node-at-loc? line column))
                                 first
                                 :name)]
-        (map #(conj (vec (take 4 %))
-                    var-name
-                    (.getCanonicalPath (java.io.File. file))
-                    (match file-content
-                      (first %)
-                      (second %)))
+        (map #(merge %
+                     {:name var-name
+                      :file (.getCanonicalPath (java.io.File. file))
+                      :match (match file-content
+                               (:line-beg %)
+                               (:line-end %))})
              (find-nodes var-name
                          [top-level-form-ast]
                          #(and (#{:local :binding} (:op %))
                                (= local-var-name (-> % :name))
                                (:local %))))))))
 
-(defn to-find-symbol-result
+(defn- to-find-symbol-result
   [{:keys [line-beg line-end col-beg col-end name file match]}]
   [line-beg line-end col-beg col-end name file match])
 
 (defn find-symbol [{:keys [file ns name dir line column ignore-errors]}]
   (util/throw-unless-clj-file file)
-  (or
-   ;; find-macro is first because find-global-symbol returns garb for macros
-   (some->> name find-macro (map to-find-symbol-result))
-   (not-empty (find-local-symbol file name line column))
-   (find-global-symbol file ns name dir (and ignore-errors
-                                             (or (not (coll? ignore-errors))
-                                                 (not-empty ignore-errors))))))
+  (map to-find-symbol-result
+       (or
+        ;; find-macro is first because find-global-symbol returns garb for macros
+        (some->> name find-macro)
+        (and (seq file) (not-empty (find-local-symbol file name line column)))
+        (find-global-symbol file ns name dir (and ignore-errors
+                                                  (or (not (coll? ignore-errors))
+                                                      (not-empty ignore-errors)))))))
 
 (defn create-result-alist
   [line-beg line-end col-beg col-end name file match]
@@ -195,6 +198,7 @@
         :match match))
 
 (defn find-debug-fns [{:keys [ns-string debug-fns]}]
-  (let [res  (-> ns-string ns-ast (find-invokes debug-fns))]
+  (let [res  (-> ns-string ns-ast (find-invokes debug-fns))
+        res (map to-find-symbol-result res)]
     (when (seq res)
       res)))