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

Avoid needless .cljc namespace reader macro usage #147

Merged
merged 1 commit into from
Feb 22, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/refactor_nrepl/ns/rebuild.clj
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,9 @@
(let [rdr-cond (symbol "#?@")
clj-forms (build-clj-or-cljs-dep-forms deps :clj)
cljs-forms (build-clj-or-cljs-dep-forms deps :cljs)]
(if (and clj-forms clj-forms)
(if (and clj-forms
cljs-forms
(not= clj-forms cljs-forms))
(list rdr-cond `(:clj ~(vec clj-forms) :cljs ~(vec cljs-forms)))
(or clj-forms cljs-forms))))

Expand Down
7 changes: 7 additions & 0 deletions test/refactor_nrepl/ns/clean_ns_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
(def cljc-ns-cleaned-clj (core/read-ns-form (absolute-path "test/resources/cljcns_cleaned.cljc")))
(def cljc-ns-cleaned-cljs (core/read-ns-form :cljs (absolute-path "test/resources/cljcns_cleaned.cljc")))

(def cljc-ns-same-clj-cljs (clean-msg "test/resources/cljcns_same_clj_cljs.cljc"))
(def cljc-ns-same-clj-cljs-cleaned (core/read-ns-form (absolute-path "test/resources/cljcns_same_clj_cljs_cleaned.cljc")))

(def ns-with-shorthand-meta (clean-msg "test/resources/ns_with_shorthand_meta.clj"))

(deftest combines-requires
Expand Down Expand Up @@ -165,6 +168,10 @@
(is (= cljc-ns-cleaned-clj new-clj-ns))
(is (= cljc-ns-cleaned-cljs new-cljs-ns))))

(deftest does-not-use-read-conditionals-when-ns-are-equal
(is (= (clean-ns cljc-ns-same-clj-cljs)
cljc-ns-same-clj-cljs-cleaned)))

(deftest respects-no-prune-option
(config/with-config {:prune-ns-form false}
(let [new-require (core/get-ns-component (clean-ns ns3) :require)
Expand Down
5 changes: 5 additions & 0 deletions test/resources/cljcns_same_clj_cljs.cljc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(ns resources.cljcns-same-clj-cljs
(:require [clojure.string :as str]
clojure.walk))

(str/trim "abc")
4 changes: 4 additions & 0 deletions test/resources/cljcns_same_clj_cljs_cleaned.cljc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
(ns resources.cljcns-same-clj-cljs
(:require [clojure.string :as str]))

(str/trim "abc")