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

Namespaces should be reloaded after compilation #41

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions deps.edn
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{:paths ["src"]
:deps {org.clojure/clojure {:mvn/version "1.12.0" :mvn/scope "provided"}
org.clojure/tools.namespace {:mvn/version "1.5.0"}
org.ow2.asm/asm {:mvn/version "9.7"}}

:aliases
Expand Down
5 changes: 5 additions & 0 deletions src/virgil/compile.clj
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
(:require
[clojure.java.io :as io]
[virgil.watch :as watch]
[clojure.tools.namespace.repl :refer (refresh-all)]
[virgil.decompile :as decompile]
[virgil.util :refer [print-diagnostics]]
[clojure.string :as str])
Expand Down Expand Up @@ -154,6 +155,10 @@
(println "\nCompiling" (count name->source)"Java source files in" directories "...")
(binding [*print-compiled-classes* verbose?]
(compile-java options collector name->source))
;; We need to create a thread binding for *ns* so that
;; refresh-all can use in-ns.
(binding [*ns* *ns*]
(refresh-all))
(when-let [diags (seq (.getDiagnostics collector))]
(print-diagnostics diags)
diags))))
32 changes: 16 additions & 16 deletions test/virgil_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
(println "Running on Clojure" (clojure-version))
(when v (is (clojure.string/starts-with? (clojure-version) v)))))

(def ^:dynamic *dir*)

(defn mk-tmp []
(.toFile (Files/createTempDirectory "virgil" (into-array FileAttribute []))))

Expand All @@ -22,8 +20,8 @@
c (Class/forName "virgil.B" false cl)]
(eval `(. (new ~c) magicNumber))))

(defn cp [file class]
(let [dest (io/file *dir* "virgil")]
(defn cp [dir file class]
(let [dest (io/file dir "virgil")]
(.mkdir dest)
(io/copy (io/file "test" (str file ".java"))
(io/file dest (str class ".java")))))
Expand All @@ -37,11 +35,13 @@
(wait)
(when-not (f) (recur (dec i))))))

(defn recompile []
(virgil/compile-java [(str *dir*)]))
(defn recompile [dir]
(virgil/compile-java [(str dir)]))

(deftest manual-compile-test
(binding [*dir* (mk-tmp)]
(let [dir (mk-tmp)
recompile #(recompile dir)
cp #(cp dir %1 %2)]
(cp "A" 'A)
(cp "B" 'B)
(recompile)
Expand Down Expand Up @@ -83,15 +83,15 @@
(is (= 42 (magic-number)))))

(deftest warnings-shouldnt-throw-test
(binding [*dir* (mk-tmp)]
(cp "ClassWithWarning" 'ClassWithWarning)
(is (nil? (recompile))))
(let [dir (mk-tmp)]
(cp dir "ClassWithWarning" 'ClassWithWarning)
(is (nil? (recompile dir))))

(binding [*dir* (mk-tmp)]
(cp "ClassWithError" 'ClassWithError)
(is (thrown? clojure.lang.ExceptionInfo (recompile)))))
(let [dir (mk-tmp)]
(cp dir "ClassWithError" 'ClassWithError)
(is (thrown? clojure.lang.ExceptionInfo (recompile dir)))))

(deftest errors-shouldnt-break-watch-and-recompile-test
(binding [*dir* (mk-tmp)]
(cp "ClassWithError" 'ClassWithError)
(is (nil? (virgil/watch-and-recompile [(str *dir*)])))))
(let [dir (mk-tmp)]
(cp dir "ClassWithError" 'ClassWithError)
(is (nil? (virgil/watch-and-recompile [(str dir)])))))