[Fix #275] Honor cljr-ignore-analyzer-errors flag in macros analyzer

Author: mbuczko

src/refactor_nrepl/find/find_macros.clj

@@ -51,6 +51,7 @@
   (util/with-additional-ex-data [:file (.getAbsolutePath f)]
     (with-open [file-rdr (FileReader. f)]
       (binding [*ns* (or (core/path->namespace :no-error f) *ns*)
+                reader/*read-eval* false
                 reader/*data-readers* *data-readers*]
         (let [rdr (LineNumberingPushbackReader. file-rdr)
               opts {:read-cond :allow :features #{:clj} :eof :eof}]
@@ -81,9 +82,13 @@
 
 (defn- find-macro-definitions-in-project
   "Finds all macros that are defined in the project."
-  []
+  [ignore-errors?]
   (->> (core/find-in-project (some-fn core/cljc-file? core/clj-file?))
-       (mapcat get-macro-definitions-in-file-with-caching)))
+       (mapcat #(try
+                  (get-macro-definitions-in-file-with-caching %)
+                  (catch Exception e
+                    (when-not ignore-errors?
+                      (throw e)))))))
 
 (defn- get-ns-aliases
   "Create a map of ns-aliases to namespaces."
@@ -207,9 +212,9 @@
 (defn find-macro
   "Finds all occurrences of the macro, including the definition, in
   the project."
-  [fully-qualified-name]
+  [fully-qualified-name ignore-errors?]
   (when (fully-qualified-name? fully-qualified-name)
-    (let [all-defs (find-macro-definitions-in-project)
+    (let [all-defs (find-macro-definitions-in-project ignore-errors?)
           macro-def (first (filter #(= (:name %) fully-qualified-name) all-defs))
           tracker (tracker/build-tracker)
           origin-ns (symbol (core/prefix fully-qualified-name))

src/refactor_nrepl/find/find_symbol.clj

@@ -234,8 +234,9 @@
 
 (defn find-symbol [{:keys [file ns name line column ignore-errors]}]
   (core/throw-unless-clj-file file)
-  (let [macros (future (find-macro (core/fully-qualify ns name)))
-        globals (->> (find-global-symbol file ns name (= ignore-errors "true"))
+  (let [ignore-errors? (= ignore-errors "true")
+        macros (future (find-macro (core/fully-qualify ns name) ignore-errors?))
+        globals (->> (find-global-symbol file ns name ignore-errors?)
                      distinct
                      (remove find-util/spurious?)
                      future)]

test/refactor_nrepl/find/find_macros_test.clj

@@ -6,7 +6,7 @@
   (first (filter #(re-find regexp (:match %)) occurrences)))
 
 (deftest find-macro-test
-  (let [occurrences (find-macro "com.example.macro-def/my-macro")
+  (let [occurrences (find-macro "com.example.macro-def/my-macro" false)
         {:keys [line-beg col-beg file match]}
         (first (filter #(.contains (:match %) "defmacro") occurrences))]
     (testing "finds the macro definition"
@@ -29,29 +29,29 @@
       (is (.endsWith file "macro_def.clj")))))
 
 (deftest find-regular-symbol-test
-  (is (nil? (find-macro "sym"))))
+  (is (nil? (find-macro "sym" false))))
 
 (deftest find-fully-qualified-random-name
-  (is (nil? (find-macro "asdf"))))
+  (is (nil? (find-macro "asdf" false))))
 
 (deftest find-fully-qualified-fn
-  (is (nil? (find-macro "refactor-nrepl.find.find-macros/find-macro"))))
+  (is (nil? (find-macro "refactor-nrepl.find.find-macros/find-macro" false))))
 
 (deftest finds-macro-defined-in-cljc-file
   (is (found? #"defmacro cljc-macro"
-              (find-macro "com.example.macro-def-cljc/cljc-macro"))))
+              (find-macro "com.example.macro-def-cljc/cljc-macro" false))))
 
 (deftest finds-macro-defined-in-cljc-file-and-used-in-clj-file
   (is (found? #"(com.example.macro-def-cljc/cljc-macro :fully-qualified)"
-              (find-macro "com.example.macro-def-cljc/cljc-macro"))))
+              (find-macro "com.example.macro-def-cljc/cljc-macro" false))))
 
 (deftest macro-definitions-are-cached
-  (find-macro "com.example.macro-def/my-macro")
+  (find-macro "com.example.macro-def/my-macro" false)
   (with-redefs [refactor-nrepl.find.find-macros/put-cached-macro-definitions
                 (fn [& _] (throw (ex-info "Cache miss!" {})))]
-    (is (found? #"defmacro my-macro" (find-macro "com.example.macro-def/my-macro"))))
+    (is (found? #"defmacro my-macro" (find-macro "com.example.macro-def/my-macro" false))))
   (reset! @#'refactor-nrepl.find.find-macros/macro-defs-cache {})
   (with-redefs [refactor-nrepl.find.find-macros/put-cached-macro-definitions
                 (fn [& _] (throw (Exception. "Expected!")))]
     (is (thrown-with-msg? Exception #"Expected!"
-                          (find-macro "com.example.macro-def/my-macro")))))
+                          (find-macro "com.example.macro-def/my-macro" false)))))