CLJS-1648: Getting Source Info into ex-info data for Analysis Errors

Author: Bruce Hauman

src/main/clojure/cljs/analyzer.cljc

@@ -581,18 +581,16 @@
 
 (defn source-info
   ([env]
-   (when-let [line (:line env)]
-     {:file (if (= (-> env :ns :name) 'cljs.core)
-              "cljs/core.cljs"
-              *cljs-file*)
-      :line (get-line name env)
-      :column (get-col name env)}))
+   (when (:line env)
+     (source-info nil env)))
   ([name env]
-   {:file (if (= (-> env :ns :name) 'cljs.core)
-            "cljs/core.cljs"
-            *cljs-file*)
-    :line (get-line name env)
-    :column (get-col name env)}))
+   (cond-> {:file (if (= (-> env :ns :name) 'cljs.core)
+                    "cljs/core.cljs"
+                    *cljs-file*)
+            :line (get-line name env)
+            :column (get-col name env)}
+     (:root-source-info env)
+     (merge (select-keys env [:root-source-info])))))
 
 (defn message [env s]
   (str s

src/main/clojure/cljs/repl.cljc

@@ -447,7 +447,11 @@
     (evaluate-form repl-env env filename form wrap *repl-opts*))
   ([repl-env env filename form wrap opts]
    (binding [ana/*cljs-file* filename]
-     (let [ast (ana/analyze env form nil opts)
+     (let [env (assoc env
+                      :root-source-info
+                      {:source-type :fragment
+                       :source-form form })
+           ast (ana/analyze env form nil opts)
            js (comp/emit-str ast)
            def-emits-var (:def-emits-var opts)
            wrap-js