From f154aa82f451e7b6a3f995b3f4cd601d0fb70523 Mon Sep 17 00:00:00 2001 From: xificurC Date: Tue, 3 Sep 2024 16:49:09 +0200 Subject: [PATCH] [cljs-analyzer2] don't self-require for macros If the namespace has :require-macros on itself, ClojureScript or Shadow-cljs will load the Clojure namespace automatically. If not, we don't need to look for macros in this namespace. --- src/hyperfiddle/electric/impl/cljs_analyzer2.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hyperfiddle/electric/impl/cljs_analyzer2.clj b/src/hyperfiddle/electric/impl/cljs_analyzer2.clj index e0b6eab9e..163f21074 100644 --- a/src/hyperfiddle/electric/impl/cljs_analyzer2.clj +++ b/src/hyperfiddle/electric/impl/cljs_analyzer2.clj @@ -250,7 +250,7 @@ (when-not (find-var a sym ns$) (-> (cond (simple-symbol? sym) - (or (do (safe-require ns$) (some-> (find-ns ns$) (find-ns-var sym))) + (or (some-> (find-ns ns$) (find-ns-var sym)) (when-some [ref (-> a ::nses (get ns$) ::refers (get sym))] (safe-requiring-resolve ref)) (when-some [ref (-> a ::nses (get ns$) ::refer-macros (get sym))] (safe-requiring-resolve ref)) (when-not (get (-> a ::nses (get ns$) ::excludes) sym) (find-ns-var (find-ns 'clojure.core) sym)))