diff --git a/CHANGELOG.md b/CHANGELOG.md index 62bc769..5c85c53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Use `tools.analyzer.jvm` 1.3.2. +* Use `tools.reader` 1.5.1. + ## 3.10.0 * Add `always-return-ns-form` option to `clean-ns` message diff --git a/project.clj b/project.clj index 697d60b..4703ba8 100644 --- a/project.clj +++ b/project.clj @@ -10,9 +10,9 @@ ^:inline-dep [compliment "0.4.0"] ^:inline-dep [http-kit "2.5.0"] ^:inline-dep [org.clojure/data.json "2.4.0"] - ^:inline-dep [org.clojure/tools.analyzer.jvm "1.2.3"] + ^:inline-dep [org.clojure/tools.analyzer.jvm "1.3.2"] ^:inline-dep [org.clojure/tools.namespace "1.4.4" :exclusions [org.clojure/tools.reader]] - ^:inline-dep [org.clojure/tools.reader "1.3.6"] + ^:inline-dep [org.clojure/tools.reader "1.5.1"] ^:inline-dep [cider/orchard "0.21.0"] ^:inline-dep [cljfmt "0.9.2" :exclusions [rewrite-clj rewrite-cljs]] ^:inline-dep [clj-commons/fs "1.6.310"] diff --git a/src/refactor_nrepl/analyzer.clj b/src/refactor_nrepl/analyzer.clj index caffea4..ca2832e 100644 --- a/src/refactor_nrepl/analyzer.clj +++ b/src/refactor_nrepl/analyzer.clj @@ -120,6 +120,9 @@ error? (instance? Throwable ast-or-err) debug (:debug config/*config*)] + (when (and error? (System/getenv "CI")) + (.printStackTrace ^Throwable ast-or-err)) + (cond (and error? debug) (throw ast-or-err) diff --git a/test/refactor_nrepl/integration_tests.clj b/test/refactor_nrepl/integration_tests.clj index ce2471e..c385a36 100644 --- a/test/refactor_nrepl/integration_tests.clj +++ b/test/refactor_nrepl/integration_tests.clj @@ -4,6 +4,7 @@ [nrepl.server :as nrepl] [refactor-nrepl.analyzer :as analyzer] [refactor-nrepl.client :refer [connect find-unbound find-usages resolve-missing version]] + [refactor-nrepl.config :as config] [refactor-nrepl.core :as core] [refactor-nrepl.middleware])) @@ -21,8 +22,8 @@ (defn wrap-setup-once [f] (let [server (start-up-repl-server)] - - (f) + (binding [config/*config* (assoc config/*config* :debug true)] + (f)) (stop-repl-server server))) @@ -132,6 +133,12 @@ foo-res (resolve-missing :transport transport :symbol "Foo") bar-res (resolve-missing :transport transport :symbol "Bar") baz-res (resolve-missing :transport transport :symbol "Baz") + _ (do + (assert split-res) + (assert date-res) + (assert foo-res) + (assert bar-res) + (assert baz-res)) pattern-res (resolve-missing :transport transport :symbol "Pattern/quote") pattern-type (:type (first (filter #(= (:name %) 'java.util.regex.Pattern) pattern-res))) split-type (:type (first (filter #(= (:name %) 'clojure.string) split-res))) diff --git a/testproject/src/clj_namespace_from/cljc_file.clj b/testproject/src/clj_namespace_from/cljc_file.clj new file mode 100644 index 0000000..6f30a59 --- /dev/null +++ b/testproject/src/clj_namespace_from/cljc_file.clj @@ -0,0 +1 @@ +(ns clj-namespace-from.cljc-file) diff --git a/testproject/src/cljs_namespace_from/cljc_file.cljc b/testproject/src/cljs_namespace_from/cljc_file.cljc new file mode 100644 index 0000000..15df11e --- /dev/null +++ b/testproject/src/cljs_namespace_from/cljc_file.cljc @@ -0,0 +1 @@ +(ns cljs-namespace-from.cljc-file)