Skip to content

Commit b49c198

Browse files
author
dnolen
committed
macro inference also needs to check if uses that exist are *also* macros, partial solution to CLJS-1733
1 parent d197bcb commit b49c198

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/main/clojure/cljs/analyzer.cljc

+7-4
Original file line numberDiff line numberDiff line change
@@ -1805,12 +1805,15 @@
18051805

18061806
(defn check-use-macros-inferring-missing
18071807
[{:keys [name uses use-macros] :as ast} env]
1808-
(let [missing-uses (when (and *analyze-deps* (seq uses))
1809-
(missing-uses uses env))
1808+
(let [missing-uses (when (and *analyze-deps* (seq uses))
1809+
(missing-uses uses env))
1810+
maybe-macros (apply dissoc uses (keys missing-uses))
18101811
remove-missing-uses #(apply dissoc % (keys missing-uses))
18111812
ast' (-> ast
1812-
(update-in [:use-macros] merge
1813-
(check-use-macros use-macros missing-uses env))
1813+
(update-in [:use-macros]
1814+
#(-> %
1815+
(merge (check-use-macros use-macros missing-uses env))
1816+
(merge (inferred-use-macros maybe-macros env))))
18141817
(update-in [:uses] remove-missing-uses))]
18151818
(swap! env/*compiler*
18161819
#(-> %

0 commit comments

Comments
 (0)