From 483a4127a4163ff3793d56880cb44edc22758db8 Mon Sep 17 00:00:00 2001 From: vemv Date: Tue, 18 Mar 2025 07:56:11 +0100 Subject: [PATCH 1/5] Use `tools.analyzer.jvm` 1.3.2 --- CHANGELOG.md | 2 ++ project.clj | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62bc769..bcad87f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +* Use `tools.analyzer.jvm` 1.3.2. + ## 3.10.0 * Add `always-return-ns-form` option to `clean-ns` message diff --git a/project.clj b/project.clj index 697d60b..44a1d29 100644 --- a/project.clj +++ b/project.clj @@ -10,7 +10,7 @@ ^: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 [cider/orchard "0.21.0"] From 97cf276cc08d0c062ea80e88238f5039b0473eaf Mon Sep 17 00:00:00 2001 From: vemv Date: Tue, 18 Mar 2025 08:05:22 +0100 Subject: [PATCH 2/5] Use `tools.reader` 1.5.1 --- CHANGELOG.md | 1 + project.clj | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bcad87f..5c85c53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unreleased * Use `tools.analyzer.jvm` 1.3.2. +* Use `tools.reader` 1.5.1. ## 3.10.0 diff --git a/project.clj b/project.clj index 44a1d29..4703ba8 100644 --- a/project.clj +++ b/project.clj @@ -12,7 +12,7 @@ ^:inline-dep [org.clojure/data.json "2.4.0"] ^: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"] From d280df19d92e52ceae4e1b1171458eda97bc1af2 Mon Sep 17 00:00:00 2001 From: vemv Date: Tue, 18 Mar 2025 08:16:23 +0100 Subject: [PATCH 3/5] Add some assertions --- test/refactor_nrepl/integration_tests.clj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/refactor_nrepl/integration_tests.clj b/test/refactor_nrepl/integration_tests.clj index ce2471e..728804c 100644 --- a/test/refactor_nrepl/integration_tests.clj +++ b/test/refactor_nrepl/integration_tests.clj @@ -132,6 +132,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))) From 2041a4c1b5fe5cef70d846ef1a48903f4898a5ae Mon Sep 17 00:00:00 2001 From: vemv Date: Tue, 18 Mar 2025 08:33:12 +0100 Subject: [PATCH 4/5] Debug --- src/refactor_nrepl/analyzer.clj | 3 +++ test/refactor_nrepl/integration_tests.clj | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) 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 728804c..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))) From f52e310d67645de568645cc5d6bb92a693b4e7c6 Mon Sep 17 00:00:00 2001 From: vemv Date: Tue, 18 Mar 2025 09:20:42 +0100 Subject: [PATCH 5/5] Try fix --- testproject/src/clj_namespace_from/cljc_file.clj | 1 + testproject/src/cljs_namespace_from/cljc_file.cljc | 1 + 2 files changed, 2 insertions(+) create mode 100644 testproject/src/clj_namespace_from/cljc_file.clj create mode 100644 testproject/src/cljs_namespace_from/cljc_file.cljc 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)