cleanup compilation reporting, do not reporting compilation unless

actually compiling.

Author: swannodette

src/main/clojure/cljs/closure.clj

@@ -892,15 +892,13 @@
         (if (every? #(not (contains? input-set' %)) requires)
           (do
             (try
-              (util/measure (and compiler-stats verbose)
-                (str "Compile " (:ns ns-info))
-                (swap! compiled conj
-                  (-compile (or (:source-file ns-info)
-                                (:source-forms ns-info))
-                                    ; - ns-info -> ns -> cljs file relpath -> js relpath
-                    (merge opts
-                      {:output-file (comp/rename-to-js
-                                      (util/ns->relpath (:ns ns-info)))}))))
+              (swap! compiled conj
+                (-compile (or (:source-file ns-info)
+                              (:source-forms ns-info))
+                  ; - ns-info -> ns -> cljs file relpath -> js relpath
+                  (merge opts
+                    {:output-file (comp/rename-to-js
+                                    (util/ns->relpath (:ns ns-info)))})))
               (catch Throwable e
                 (reset! failed e)))
             (when-not @failed
@@ -945,12 +943,10 @@
            (for [ns-info inputs]
              ; TODO: compile-file calls parse-ns unnecessarily to get ns-info
              ; TODO: we could mark dependent namespaces for recompile here
-             (util/measure (and compiler-stats (:verbose opts))
-               (str "Compile " (:ns ns-info))
-               (-compile (or (:source-file ns-info)
-                             (:source-forms ns-info))
-                                        ; - ns-info -> ns -> cljs file relpath -> js relpath
-                 (merge opts {:output-file (comp/rename-to-js (util/ns->relpath (:ns ns-info)))}))))))))))
+             (-compile (or (:source-file ns-info)
+                           (:source-forms ns-info))
+               ; - ns-info -> ns -> cljs file relpath -> js relpath
+               (merge opts {:output-file (comp/rename-to-js (util/ns->relpath (:ns ns-info)))})))))))))
 
 (defn add-goog-base
   [inputs]

src/main/clojure/cljs/compiler.cljc

@@ -1405,18 +1405,22 @@
       (ensure
         (with-core-cljs opts
           (fn []
-            (when (or ana/*verbose* (:verbose opts))
+            (when (and (or ana/*verbose* (:verbose opts))
+                       (not (:compiler-stats opts)))
               (util/debug-prn "Compiling" (str src)))
-            (let [ext (util/ext src)
-                  {:keys [ns] :as ns-info} (ana/parse-ns src)]
-              (if-let [cached (cached-core ns ext opts)]
-                (emit-cached-core src dest cached opts)
-                (let [opts (if (macro-ns? ns ext opts)
-                             (assoc opts :macros-ns true)
-                             opts)
-                      ret  (emit-source src dest ext opts)]
-                  (.setLastModified ^File dest (util/last-modified src))
-                  ret)))))))))
+            (util/measure (and (or ana/*verbose* (:verbose opts))
+                               (:compiler-stats opts))
+              (str "Compiling " src)
+              (let [ext (util/ext src)
+                   {:keys [ns] :as ns-info} (ana/parse-ns src)]
+               (if-let [cached (cached-core ns ext opts)]
+                 (emit-cached-core src dest cached opts)
+                 (let [opts (if (macro-ns? ns ext opts)
+                              (assoc opts :macros-ns true)
+                              opts)
+                       ret (emit-source src dest ext opts)]
+                   (.setLastModified ^File dest (util/last-modified src))
+                   ret))))))))))
 
 #?(:clj
    (defn requires-compilation?