File tree Expand file tree Collapse file tree 3 files changed +8
-17
lines changed Expand file tree Collapse file tree 3 files changed +8
-17
lines changed Original file line number Diff line number Diff line change 10
10
^:source-dep [org.clojure/tools.analyzer.jvm " 0.7.1" ]
11
11
^:source-dep [org.clojure/tools.namespace " 0.3.0-alpha3" ]
12
12
^:source-dep [org.clojure/tools.reader " 1.1.1" ]
13
- ^:source-dep [org.clojure/java.classpath " 0.2.3 " ]
13
+ ^:source-dep [cider/orchard " 0.2.0 " ]
14
14
^:source-dep [lein-cljfmt " 0.3.0" ]
15
15
^:source-dep [me.raynes/fs " 1.4.6" ]
16
16
^:source-dep [rewrite-clj " 0.6.0" ]
Original file line number Diff line number Diff line change 1
1
(ns refactor-nrepl.core
2
- (:require [clojure.java.classpath :as cp]
3
- [clojure.java.io :as io]
2
+ (:require [clojure.java.io :as io]
4
3
[clojure.string :as str]
5
4
[clojure.tools.namespace.parse :as parse]
6
5
[clojure.tools.reader.reader-types :as readers]
6
+ [orchard.classpath]
7
7
[me.raynes.fs :as fs]
8
8
[refactor-nrepl.util :refer [normalize-to-unix-path]]
9
9
[refactor-nrepl.s-expressions :as sexp]
41
41
false
42
42
(:ignore-paths config/*config*))))
43
43
44
- (defn boot-project? []
45
- ; ; fake.class.path under boot contains the original directories with source
46
- ; ; files, see https://github.com/boot-clj/boot/issues/249
47
- (not (nil? (System/getProperty " fake.class.path" ))))
48
-
49
44
(defn dirs-on-classpath
50
45
" Return all dirs on classpath, filtering out our inlined deps
51
46
directory and paths matching :ignore-paths specified in config.
52
- For boot it considers `fake.class.path` rather than real classpath."
47
+ Follows the semantics of orchard classpath."
53
48
[]
54
- (let [files-on-cp (if (boot-project? )
55
- (map io/file (str/split (System/getProperty " fake.class.path" ) #":" ))
56
- (cp/classpath ))]
57
- (->> files-on-cp
58
- (filter fs/directory?)
59
- (remove #(-> % str normalize-to-unix-path ignore-dir-on-classpath?)))))
49
+ (->> (orchard.classpath/classpath-directories )
50
+ (remove #(-> % str normalize-to-unix-path (.endsWith " target/srcdeps" )))))
60
51
61
52
(defn project-root
62
53
" Return the project root directory.
Original file line number Diff line number Diff line change 3
3
; ;;; Distributed under the Eclipse Public License, the same as Clojure.
4
4
(ns refactor-nrepl.ns.slam.hound.search
5
5
" Search the classpath for vars and classes."
6
- (:require [clojure.java. classpath :as cp ]
6
+ (:require [orchard. classpath]
7
7
[clojure.java.io :refer [file]]
8
8
[clojure.string :as string])
9
9
(:import
111
111
(into (map #(System/getProperty %) [" sun.boot.class.path"
112
112
" java.ext.dirs"
113
113
" java.class.path" ])
114
- (map #(.getName %) (cp /classpath-jarfiles ))))
114
+ (map #(.getName %) (orchard.classpath /classpath-jarfiles ))))
115
115
116
116
(defn- get-available-classes []
117
117
(into ()
You can’t perform that action at this time.
0 commit comments