CLJS-1155: REPL :watch support does not play nicely with :cljs/quit

Author: dnolen

src/clj/cljs/closure.clj

@@ -47,6 +47,7 @@
            [java.net URL]
            [java.util.logging Level]
            [java.util List Random]
+           [java.util.concurrent TimeUnit]
            [com.google.javascript.jscomp CompilerOptions CompilationLevel
               CompilerOptions$LanguageMode SourceMap$Format
               SourceMap$DetailLevel ClosureCodingConvention SourceFile
@@ -1486,6 +1487,8 @@ should contain the source for the given namespace name."
         env/*compiler*
         (env/default-compiler-env opts))))
   ([source opts compiler-env]
+    (watch source opts compiler-env nil))
+  ([source opts compiler-env quit]
     (let [opts (cond-> opts
                  (= (:verbose opts :not-found) :not-found)
                  (assoc :verbose true))
@@ -1529,14 +1532,17 @@ should contain the source for the given namespace name."
         (println "Watching path:" source)
         (watch-all path)
         (loop [key nil]
-          (when (or (nil? key) (. ^WatchKey key reset))
-            (let [key (. service take)]
-              (when (some (fn [^WatchEvent e]
-                            (let [fstr (.. e context toString)]
-                              (and (or (. fstr (endsWith "cljs"))
-                                       (. fstr (endsWith "js")))
-                                   (not (. fstr (startsWith ".#"))))))
-                      (seq (.pollEvents key)))
+          (when (and (or (nil? quit) (not @quit))
+                     (or (nil? key) (. ^WatchKey key reset)))
+            (let [key (. service (poll 300 TimeUnit/MILLISECONDS))]
+              (when (and key
+                         (some
+                           (fn [^WatchEvent e]
+                             (let [fstr (.. e context toString)]
+                               (and (or (. fstr (endsWith "cljs"))
+                                        (. fstr (endsWith "js")))
+                                    (not (. fstr (startsWith ".#"))))))
+                           (seq (.pollEvents key))))
                 (println "Change detected, recompiling ...")
                 (flush)
                 (buildf))

src/clj/cljs/repl.clj

@@ -691,7 +691,8 @@
                :caught caught
                :reader reader
                :print-no-newline print-no-newline
-               :source-map-inline source-map-inline})))]
+               :source-map-inline source-map-inline})))
+        done? (atom false)]
     (env/with-compiler-env (or compiler-env (env/default-compiler-env opts))
      (binding [*err* (if bind-err *out* *err*)
                ana/*cljs-ns* 'cljs.user
@@ -755,17 +756,21 @@
                  (catch Throwable e
                    (caught e repl-env opts)))
                (when-let [src (:watch opts)]
-                 (future
-                   (let [log-file (io/file (util/output-directory opts) "watch.log")]
-                     (err-out (print "Watch compilation log available at:" (str log-file)))
-                     (flush)
-                     (try
-                       (let [log-out (FileWriter. log-file)]
-                         (binding [*err* log-out
-                                   *out* log-out]
-                           (cljsc/watch src (dissoc opts :watch))))
-                       (catch Throwable e
-                         (caught e repl-env opts))))))
+                 (.start
+                   (Thread.
+                     ((ns-resolve 'clojure.core 'binding-conveyor-fn)
+                       (fn []
+                         (let [log-file (io/file (util/output-directory opts) "watch.log")]
+                           (err-out (print "Watch compilation log available at:" (str log-file)))
+                           (flush)
+                           (try
+                             (let [log-out (FileWriter. log-file)]
+                               (binding [*err* log-out
+                                         *out* log-out]
+                                 (cljsc/watch src (dissoc opts :watch)
+                                   env/*compiler* done?)))
+                             (catch Throwable e
+                               (caught e repl-env opts)))))))))
                ;; let any setup async messages flush
                (Thread/sleep 50)
                (binding [*in* (if (true? (:source-map-inline opts))
@@ -785,7 +790,8 @@
                        (prompt)
                        (flush))
                      (recur))))))))
-         (-tear-down repl-env)))))
+       (reset! done? true)
+       (-tear-down repl-env)))))
 
 (defn repl
   "Generic, reusable, read-eval-print loop. By default, reads from *in* using