[#133] Don't throw if no ns form in the .clj file

clojure-emacs · Mar 8, 2016 · c34303d · expez · Mar 8, 2016 · benedekfazekas
1 parent 8cc9dcf
commit c34303d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/src/refactor_nrepl/core.clj b/src/refactor_nrepl/core.clj
@@ -237,17 +237,15 @@
   Dialect is either :clj or :cljs."
   ([path]
    (with-open [file-reader (FileReader. path)]
-     (if-let [ns-form (parse/read-ns-decl (readers/indexing-push-back-reader
+     (when-let [ns-form (parse/read-ns-decl (readers/indexing-push-back-reader
                                            (PushbackReader. file-reader)))]
-       (with-meta ns-form (extract-ns-meta (slurp path)))
-       (throw (IllegalStateException. (str "No ns form at " path))))))
+       (with-meta ns-form (extract-ns-meta (slurp path))))))
   ([dialect path]
    (with-open [file-reader (FileReader. path)]
-     (if-let [ns-form (parse/read-ns-decl (readers/indexing-push-back-reader
+     (when-let [ns-form (parse/read-ns-decl (readers/indexing-push-back-reader
                                            (PushbackReader. file-reader))
                                           {:read-cond :allow :features #{dialect}})]
-       (with-meta ns-form (extract-ns-meta (slurp path)))
-       (throw (IllegalStateException. (str "No ns form at " path)))))))
+       (with-meta ns-form (extract-ns-meta (slurp path)))))))
 
 (defn path->namespace
   "Read the ns form found at PATH and return the namespace object for

diff --git a/src/refactor_nrepl/ns/libspecs.clj b/src/refactor_nrepl/ns/libspecs.clj
@@ -24,6 +24,9 @@
        (mapcat identity)
        (apply hash-map)))
 
+(defn- cache-contains? [f lang]
+  (-> @cache (get (.getAbsolutePath f)) (contains? lang)))
+
 (defn- get-cached-libspec [f lang]
   (when-let [[ts v] (get-in @cache [(.getAbsolutePath f) lang])]
     (when (= ts (.lastModified f))
@@ -36,8 +39,8 @@
     libspecs))
 
 (defn- get-libspec-from-file-with-caching [lang f]
-  (if-let [v (get-cached-libspec f lang)]
-    v
+  (if (cache-contains? f lang)
+    (get-cached-libspec f lang)
     (put-cached-libspec f lang)))
 
 (defn namespace-aliases

diff --git a/test/refactor_nrepl/ns/clean_ns_test.clj b/test/refactor_nrepl/ns/clean_ns_test.clj
@@ -83,9 +83,8 @@
                (clean-ns ns-with-exclude))))
 
 (deftest throws-on-malformed-ns
-  (is (thrown? IllegalStateException
-               (core/read-ns-form (.getAbsolutePath
-                                   (File. "test/resources/clojars-artifacts.edn"))))))
+  (is (not (core/read-ns-form (.getAbsolutePath
+                               (File. "test/resources/clojars-artifacts.edn"))))))
 
 (deftest preserves-other-elements
   (let [actual (clean-ns ns1)

diff --git a/test/resources/testproject/src/com/example/empty_file.clj b/test/resources/testproject/src/com/example/empty_file.clj
@@ -0,0 +1,2 @@
+;; empty file
+;; to test that empty, no ns form clj files don't break refactor-nrepl indexers
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		;; empty file
		;; to test that empty, no ns form clj files don't break refactor-nrepl indexers