Fix #'in-refresh-dirs?'

3.0.0-alpha4

Author: vemv

project.clj

@@ -1,4 +1,4 @@
-(defproject refactor-nrepl "3.0.0-alpha1"
+(defproject refactor-nrepl "3.0.0-alpha4"
   :description "nREPL middleware to support editor-agnostic refactoring"
   :url "http://github.com/clojure-emacs/refactor-nrepl"
   :license {:name "Eclipse Public License"

src/refactor_nrepl/ns/tracker.clj

@@ -60,31 +60,38 @@
                      (deps-set ns))]
       file)))
 
-(defn- in-refresh-dirs? [refresh-dirs file]
+(defn- absolutize-refresh-dirs [refresh-dirs]
+  (->> refresh-dirs
+       (map (fn [^String s]
+              (File. s)))
+       (filter (fn [^File f]
+                 (.exists f)))
+       (map (fn [^File f]
+              (let [v (.getCanonicalPath f)]
+                (cond-> v
+                  (not (str/ends-with? v File/separator))
+                  ;; add a trailing slash for a more robust comparison with `file-as-absolute-paths`:
+                  (str File/separator)))))))
+
+(defn in-refresh-dirs?
+  "Is `filename` located within any of `refresh-dirs`?"
+  [refresh-dirs refresh-dirs-as-absolute-paths filename]
   (if-not (seq refresh-dirs)
     ;; the end user has not set the `refresh-dirs`, so this defn's logic should be bypassed:
     true
-    (let [file-as-absolute-paths (-> file io/file .getCanonicalPath)
-          refresh-dirs-as-absolute-paths (->> refresh-dirs
-                                              (map (fn [^String s]
-                                                     (File. s)))
-                                              (filter (fn [^File f]
-                                                        (.exists f)))
-                                              (map (fn [^File f]
-                                                     (let [v (.getCanonicalPath f)]
-                                                       (cond-> v
-                                                         (not (str/ends-with? v File/separator))
-                                                         ;; add a trailing slash for a more robust comparison with `file-as-absolute-paths`:
-                                                         (str File/separator))))))]
-      (boolean (some #(str/starts-with? % file-as-absolute-paths)
-                     refresh-dirs-as-absolute-paths)))))
+    (let [file (-> filename io/file)
+          file-as-absolute-path (-> file .getCanonicalPath)]
+      (and (-> file .exists)
+           (-> file .isFile)
+           (boolean (some (partial str/starts-with? file-as-absolute-path)
+                          refresh-dirs-as-absolute-paths))))))
 
 (defn project-files-in-topo-order
   ([]
    (project-files-in-topo-order false))
   ([ignore-errors?]
    (let [tracker (build-tracker (util/with-suppressed-errors
-                                  (every-pred (partial in-refresh-dirs? (user-refresh-dirs))
+                                  (every-pred (partial in-refresh-dirs? refresh-dirs (absolutize-refresh-dirs user-refresh-dirs))
                                               core/clj-file?)
                                   ignore-errors?))
          nses (dep/topo-sort (:clojure.tools.namespace.track/deps tracker))

test/refactor_nrepl/ns/tracker_test.clj

@@ -0,0 +1,20 @@
+(ns refactor-nrepl.ns.tracker-test
+  (:require
+   [refactor-nrepl.ns.tracker :as sut]
+   [clojure.test :refer [are deftest]]))
+
+(deftest in-refresh-dirs?
+  (are [refresh-dirs file-ns expected] (= expected
+                                          (sut/in-refresh-dirs? refresh-dirs
+                                                                (#'sut/absolutize-refresh-dirs refresh-dirs)
+                                                                file-ns))
+    ;; if the refresh dirs are unset, we return `true` no matter what:
+    []       "src/refactor_nrepl/ns/tracker.clj"       true
+
+    ["src"]  "src/refactor_nrepl/ns/tracker.clj"       true
+    ["src"]  "test/refactor_nrepl/ns/tracker_test.clj" false
+    ["test"] "test/refactor_nrepl/ns/tracker_test.clj" true
+    ["src"]  "project.clj"                             false
+    ["src"]  "/"                                       false
+    ["ffff"] "src/refactor_nrepl/ns/tracker.clj"       false
+    ["src"]  "src/refactor_nrepl/ns/trackeeeeeer.clj"  false))