CLJS-1187: var ast contains internal nodes with bad analysis :context

ensure that internal var AST nodes are analyzed in :expr contexts

Author: swannodette

src/clj/cljs/analyzer.clj

@@ -655,10 +655,11 @@
 
 (defmethod parse 'var
   [op env [_ sym :as form] _ _]
-  (let [var (resolve-var env sym (confirm-var-exists-throw))]
+  (let [var (resolve-var env sym (confirm-var-exists-throw))
+        expr-env (assoc env :context :expr)]
     {:env env :op :var-special :form form
-     :var (analyze env sym)
-     :sym (analyze env `(quote ~(symbol (name (:ns var)) (name (:name var)))))
+     :var (analyze expr-env sym)
+     :sym (analyze expr-env `(quote ~(symbol (name (:ns var)) (name (:name var)))))
      :meta (let [ks [:ns :doc :file :line :column]
                  m (merge
                      (assoc (zipmap ks (map #(list 'quote (get var %)) ks))
@@ -669,7 +670,7 @@
                            uks (keys user-meta)]
                        (zipmap uks
                          (map #(list 'quote (get user-meta %)) uks))))]
-             (analyze env m))}))
+             (analyze expr-env m))}))
 
 (defmethod parse 'if
   [op env [_ test then else :as form] name _]

test/cljs/cljs/core_test.cljs

@@ -2721,6 +2721,21 @@
   (is (= identity (dispatch-fn cljs-1144)))
   (is (= ::default (default-dispatch-val cljs-1144))))
 
+(defn foo-1187 [] (print "foo!"))
+
+(defn bar-1187 [] (print "bar!"))
+
+(defn print-foo-1187 [fb]
+  (apply
+    (case fb
+      :foo #'foo-1187
+      :bar #'bar-1187) []))
+
+(deftest test-cljs-1187 []
+  (testing "Internal var nodes analyzed in expression context"
+    (is (= (with-out-str (print-foo-1187 :foo))
+           "foo!"))))
+
 (comment
   ;; ObjMap
   ;; (let [ks (map (partial str "foo") (range 500))