Skip to content
Merged
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
17 changes: 11 additions & 6 deletions src/main/clojure/cljs/analyzer.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -484,12 +484,17 @@
"ambiguous expression " form)))

(defn default-warning-handler [warning-type env extra]
(when (warning-type *cljs-warnings*)
(when-let [s (error-message warning-type extra)]
#?(:clj (binding [*out* *err*]
(println (message env (str "WARNING: " s))))
:cljs (binding [*print-fn* *print-err-fn*]
(println (message env (str "WARNING: " s))))))))
(let [warn-mode (warning-type *cljs-warnings*)]
(when-not (#{false :off} warn-mode)
(when-let [s (error-message warning-type extra)]
(cond
(#{true :warning} warn-mode)
#?(:clj (binding [*out* *err*]
(println (message env (str "WARNING: " s))))
:cljs (binding [*print-fn* *print-err-fn*]
(println (message env (str "WARNING: " s)))))
(= :error warn-mode)
(throw (ex-info s {})))))))

(def ^:dynamic *cljs-warning-handlers*
[default-warning-handler])
Expand Down
15 changes: 9 additions & 6 deletions src/main/clojure/cljs/closure.clj
Original file line number Diff line number Diff line change
Expand Up @@ -3048,15 +3048,18 @@
ana/*load-tests* (not= (:load-tests opts) false)
ana/*cljs-warnings*
(let [warnings (opts :warnings true)]
(merge
ana/*cljs-warnings*
(if (or (true? warnings)
(false? warnings))
(cond
(map? warnings)
(merge ana/*cljs-warnings* warnings)

;; backwards compatible
(or (boolean? warnings)
(keyword? warnings))
(merge ana/*cljs-warnings*
(zipmap
[:unprovided :undeclared-var
:undeclared-ns :undeclared-ns-form]
(repeat warnings))
warnings)))
(repeat warnings)))))
ana/*verbose* (:verbose opts)]
(when (and ana/*verbose* (not (::watch-triggered-build? opts)))
(util/debug-prn "Options passed to ClojureScript compiler:" (pr-str opts)))
Expand Down
Loading