Skip to content

Commit 637e247

Browse files
mfikesswannodette
authored andcommitted
CLJS-1417: cljs.js: require macros failure error message pertains to non-macros
Adds and uses a new analyzer error message specifically for the failure to load a macros ns.
1 parent 7f29513 commit 637e247

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

src/main/cljs/cljs/js.cljs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,9 @@
223223
(str "Invalid :lang specified " lang ", only :clj or :js allowed"))))))
224224
(cb (wrap-error
225225
(ana/error env
226-
(ana/error-message :undeclared-ns
226+
(ana/error-message (if (:macros-ns opts)
227+
:undeclared-macros-ns
228+
:undeclared-ns)
227229
{:ns-sym name :js-provide (cljs.core/name name)})))))))
228230
(catch :default cause
229231
(cb (wrap-error

src/main/clojure/cljs/analyzer.cljc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,12 @@
228228
", " (ns->relpath ns-sym :cljc)
229229
", or Closure namespace \"" js-provide "\""))
230230

231+
(defmethod error-message :undeclared-macros-ns
232+
[warning-type {:keys [ns-sym js-provide] :as info}]
233+
(str "No such macros namespace: " ns-sym
234+
", could not locate " (ns->relpath ns-sym :clj)
235+
" or " (ns->relpath ns-sym :cljc)))
236+
231237
(defmethod error-message :dynamic
232238
[warning-type info]
233239
(str (:name info) " not declared ^:dynamic"))

0 commit comments

Comments
 (0)