Fix instrumentation on forms like (-> 1 inc inc) "without wrapping parens

Author: jpmonettas

src/main/clojure/cljs/analyzer.cljc

@@ -2281,7 +2281,7 @@ x                          (not (contains? ret :info)))
        :type type
        :form form
        :recurs recurs
-       :cljs.storm/coord (-> form meta :cljs.storm/coord)}
+       :cljs.storm/coord (storm-utils/coord-of form)}
       (if (some? expr)
         {:body (assoc expr :body? true)
          :children [:params :body]}
@@ -2345,7 +2345,7 @@ x                          (not (contains? ret :info)))
         skip-expr-instrumentation? (or (:cljs.storm/skip-expr-instrumentation? form-meta)
                                        (:cljs.storm/skip-expr-instrumentation? (meta name)))
         fn-trace-name (:cljs.storm/fn-trace-name form-meta)
-        form-coord (-> form meta :cljs.storm/coord)
+        form-coord (storm-utils/coord-of form)
         env (cond-> env              
               true           (assoc :enclosing-context :fn)
               true           (assoc :cljs.storm/wrapping-fn-coord form-coord)
@@ -2532,7 +2532,7 @@ x                          (not (contains? ret :info)))
               be {:op :binding
                   :name name
                   :form name
-                  :cljs.storm/coord (-> name meta :cljs.storm/coord)
+                  :cljs.storm/coord (storm-utils/coord-of name)
                   :line line
                   :column col
                   :init init-expr
@@ -4149,7 +4149,8 @@ x                          (not (contains? ret :info)))
     (do
       (register-constant! env sym)
       (analyze-wrap-meta {:op :const :val sym :env env :form sym :tag 'cljs.core/Symbol}))
-    (let [{:keys [line column cljs.storm/coord]} (meta sym)
+    (let [{:keys [line column]} (meta sym)
+          coord (storm-utils/coord-of sym)
           env  (if-not (nil? line)
                  (assoc env :line line)
                  env)
@@ -4661,7 +4662,7 @@ x                          (not (contains? ret :info)))
         skip-ns? (storm-emitter/skip-instrumentation? (get-in env [:ns :name]))
         form (cond-> form
                (and top-level-form? (not skip-ns?)) (storm-utils/tag-form-recursively :cljs.storm/coord))
-        {:keys [cljs.storm/coord]} (meta form)
+        coord (storm-utils/coord-of form)
         env (cond-> env
               top-level-form? (assoc :cljs.storm/form-id (hash form)
                                      :cljs.storm/form-emitted-coords-set (atom #{}))

src/main/clojure/cljs/storm/utils.cljc

@@ -4,6 +4,18 @@
   #?(:clj (:import [java.nio.file Files]
                    [java.nio.file.attribute FileTime])))
 
+(defn coord-of [form]
+  (if-let [coord (-> form meta :cljs.storm/coord)]
+    coord
+    (when (and form
+               (seq? form)
+               (pos? (count form)))
+     ;; If the form is a list and has no coord, maybe it was
+     ;; destroyed by a macro. Try guessing the coord by looking at
+     ;; the first element. This fixes `->`, for instance.
+
+      (-> form first meta :cljs.storm/coord))))
+
 (defn merge-meta
 
   "Non-throwing version of (vary-meta obj merge metamap-1 metamap-2 ...).