CLJS-1197: load-file does not reload associated macro namespace

cljs.analyzer.api:
    - add remove-ns

cljs.analyzer:
    - add *reload-macros* dynamic var
    - when associated macro ns & *reload-macros* true, reload
      the macro ns.

cljs.repl:
    - in load-file remove the namespace so we get a fresh analysis
      bind *reload-macros* to true when analyzing the file

Author: swannodette

src/clj/cljs/analyzer.clj

@@ -35,6 +35,7 @@
 (def ^:dynamic *analyze-deps* true)
 (def ^:dynamic *load-tests* true)
 (def ^:dynamic *load-macros* true)
+(def ^:dynamic *reload-macros* false)
 (def ^:dynamic *macro-infer* true)
 
 (def ^:dynamic *file-defs* nil)
@@ -1520,14 +1521,16 @@
       (load-core)
       (doseq [nsym (vals use-macros)]
         (let [k (or (:use-macros @reload)
-                    (get-in @reloads [:use-macros nsym]))]
+                    (get-in @reloads [:use-macros nsym])
+                    (and (= nsym name) *reload-macros* :reload))]
           (if k
             (clojure.core/require nsym k)
             (clojure.core/require nsym))
           (intern-macros nsym k)))
       (doseq [nsym (vals require-macros)]
         (let [k (or (:require-macros @reload)
-                    (get-in @reloads [:require-macros nsym]))]
+                    (get-in @reloads [:require-macros nsym])
+                    (and (= nsym name) *reload-macros* :reload))]
           (if k
             (clojure.core/require nsym k)
             (clojure.core/require nsym))

src/clj/cljs/analyzer/api.clj

@@ -8,7 +8,7 @@
 
 (ns cljs.analyzer.api
   (:refer-clojure :exclude [all-ns ns-interns ns-resolve resolve find-ns
-                            ns-publics])
+                            ns-publics remove-ns])
   (:require [cljs.env :as env]
             [cljs.analyzer :as ana]))
 
@@ -63,6 +63,12 @@
   {:pre [(symbol? ns) (symbol? sym)]}
   (get-in @env/*compiler* [::ana/namespaces ns :defs sym]))
 
+(defn remove-ns
+  "Removes the namespace named by the symbol."
+  [ns]
+  {:pre [(symbol? ns)]}
+  (swap! env/*compiler* update-in [::ana/namespaces] dissoc ns))
+
 (defmacro in-cljs-user
   "Binds cljs.analyzer/*cljs-ns* to 'cljs.user and uses the given compilation
   environment atom and runs body."

src/clj/cljs/repl.clj

@@ -503,10 +503,13 @@
             (slurp src)))
         ;; need to load dependencies first
         (load-dependencies repl-env (:requires compiled) opts)
+        ;; remove the ns to get :reload semantics
+        (ana-api/remove-ns (:ns (ana/parse-ns src)))
         ;; make sure it's been analyzed, this is because if it's already compiled
         ;; cljs.compiler/compile-file won't do anything, good for builds,
         ;; but a bit annoying here
-        (ana/analyze-file src opts)
+        (binding [ana/*reload-macros* true]
+          (ana/analyze-file src opts))
         (-evaluate repl-env f 1 (cljsc/add-dep-string opts compiled))
         (-evaluate repl-env f 1
           (cljsc/src-file->goog-require src {:wrap true :reload true})))