CLJS-697: top-level symbol reference doesn't get an automatically

inserted ns-name Add another resolve-var . case, check the current ns
clojure · Nov 24, 2013 · d4bf882 · d4bf882
1 parent 8f7a199
commit d4bf882
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/src/clj/cljs/analyzer.clj b/src/clj/cljs/analyzer.clj
@@ -331,11 +331,16 @@
                  lb (-> env :locals prefix)]
              (if lb
                {:name (symbol (str (:name lb) suffix))}
-               (if-let [full-ns (get-in @env/*compiler* [::namespaces (-> env :ns :name) :imports prefix])]
+               (let [cur-ns (-> env :ns :name)]
-                 {:name (symbol (str full-ns) suffix)}
+                 (if-let [full-ns (get-in @env/*compiler* [::namespaces cur-ns :imports prefix])]
-                 (merge (get-in @env/*compiler* [::namespaces prefix :defs (symbol suffix)])
+                   {:name (symbol (str full-ns) suffix)}
-                   {:name (if (= "" prefix) (symbol suffix) (symbol (str prefix) suffix))
+                   (if-let [info (get-in @env/*compiler* [::namespaces cur-ns :defs prefix])]
-                    :ns prefix}))))
+                     (merge info
+                       {:name (symbol (str cur-ns) (str sym))
+                        :ns cur-ns})
+                     (merge (get-in @env/*compiler* [::namespaces prefix :defs (symbol suffix)])
+                       {:name (if (= "" prefix) (symbol suffix) (symbol (str prefix) suffix))
+                        :ns prefix}))))))
 
            (get-in @env/*compiler* [::namespaces (-> env :ns :name) :uses sym])
            (let [full-ns (get-in @env/*compiler* [::namespaces (-> env :ns :name) :uses sym])]
@@ -354,8 +359,8 @@
              (when confirm
                (confirm env full-ns sym))
              (merge (get-in @env/*compiler* [::namespaces full-ns :defs sym])
-                    {:name (symbol (str full-ns) (str sym))
+               {:name (symbol (str full-ns) (str sym))
-                     :ns full-ns})))))))
+                :ns full-ns})))))))
 
 (defn resolve-existing-var [env sym]
   (if-not (-> sym meta ::no-resolve)