TANAL-134 remove :init from :def's :children when absent

Author: frenchy64

CHANGELOG.md

@@ -1,5 +1,7 @@
 Changelog
 ========================================
+* Unreleased
+  * TANAL-134: Remove :init from :def's :children when absent
 * Release 1.0.0 on 18 Feb 2020
   * Fixed docstrings
 * Release 0.7.0 on 10 Dec 2018

src/main/clojure/clojure/tools/analyzer/passes/elide_meta.clj

@@ -73,7 +73,10 @@
         (if (= new-meta (:form meta))
           ast
           (assoc ast :meta (replace-meta meta new-meta)))
-        (assoc (dissoc ast :meta) :children [:init]))
+        (let [ast (dissoc ast :meta)]
+          (if-let [new-children (not-empty (filterv (complement #{:meta}) (:children ast)))]
+            (assoc ast :children new-children)
+            (dissoc ast :children))))
       ast)))
 
 (defn elide-meta

src/test/clojure/clojure/tools/analyzer/core_test.clj

@@ -183,4 +183,20 @@
   (let [i-ast (ast (1 2))]
     (is (= :invoke (-> i-ast :op)))
     (is (= 1 (-> i-ast :fn :form)))
-    (is (= [2] (->> i-ast :args (mapv :form))))))
+    (is (= [2] (->> i-ast :args (mapv :form)))))
+
+  (let [def-ast (ast (def a))]
+    (is (= :def (-> def-ast :op)))
+    (is (empty? (-> def-ast :children)))
+    (is (nil? (:init def-ast))))
+
+  (let [def-ast (ast (def a nil))]
+    (is (= :def (-> def-ast :op)))
+    (is (= [:init] (:children def-ast)))
+    (is (= :const (-> def-ast :init :op))))
+
+  (let [def-ast (ast (def a "doc" nil))]
+    (is (= :def (-> def-ast :op)))
+    (is (= [:meta :init] (:children def-ast)))
+    (is (= "doc" (-> def-ast :doc)))
+    (is (= :const (-> def-ast :init :op)))))