Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use tools.analyzer.jvm 1.3.2 #411

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
3 changes: 3 additions & 0 deletions src/refactor_nrepl/analyzer.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
11 changes: 9 additions & 2 deletions test/refactor_nrepl/integration_tests.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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]))

Expand All @@ -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)))

Expand Down Expand Up @@ -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)))
Expand Down
1 change: 1 addition & 0 deletions testproject/src/clj_namespace_from/cljc_file.clj
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(ns clj-namespace-from.cljc-file)
1 change: 1 addition & 0 deletions testproject/src/cljs_namespace_from/cljc_file.cljc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(ns cljs-namespace-from.cljc-file)