dev: libs tests improve deps diff

Naively preserve indentation when updating deps in deps.edn
and project.clj for better at-a-glance diffs.

Author: lread

script/helper/deps_patcher.clj

@@ -1,6 +1,7 @@
 (ns helper.deps-patcher
   "Quick and dirty little project.clj and deps.edn patcher"
-  (:require [rewrite-clj.zip :as z]))
+  (:require [rewrite-clj.node :as n]
+            [rewrite-clj.zip :as z]))
 
 (defn- find-project-deps
   "Interested in top level deps only at this time."
@@ -22,10 +23,15 @@
                 last))
 
 (defn- add-project-deps [zloc new-deps]
-  (reduce (fn [zloc dep]
-            (z/append-child zloc dep))
-          (find-project-deps zloc)
-          new-deps))
+  (let [zloc-deps (find-project-deps zloc)
+        indent (n/spaces (-> zloc-deps z/node meta :col))]
+    (reduce (fn [zloc dep]
+              (-> zloc
+                  (z/append-child* (n/newlines 1))
+                  (z/append-child* indent)
+                  (z/append-child dep)))
+            zloc-deps
+            new-deps)))
 
 (defn update-project-deps [{:keys [filename additions removals] :as kwargs}]
   (println kwargs)
@@ -48,9 +54,16 @@
           dep-syms))
 
 (defn- add-deps-deps [zloc new-deps]
-  (reduce (fn [zloc dep] (z/append-child zloc dep))
-          (z/get zloc :deps)
-          (mapcat identity new-deps)))
+  (let [zloc-deps (z/get zloc :deps)
+        indent (n/spaces (-> zloc-deps z/node meta :col))]
+    (reduce (fn [zloc [k v]]
+              (-> zloc
+                  (z/append-child* (n/newlines 1))
+                  (z/append-child* indent)
+                  (z/append-child k)
+                  (z/append-child v)))
+            zloc-deps
+            new-deps)))
 
 (defn update-deps-deps [{:keys [filename additions removals] :as kwargs}]
   (println kwargs)

script/libs_tests.clj

@@ -144,7 +144,7 @@
 (defn deps-edn-v1-patch [{:keys [home-dir rewrite-clj-version]}]
   (patch-deps {:filename (str (fs/file home-dir "deps.edn"))
                :removals #{'rewrite-clj 'rewrite-clj/rewrite-clj}
-               :additions {'rewrite-clj/rewrite-clj {:mvn/version rewrite-clj-version}}}))
+               :additions [['rewrite-clj/rewrite-clj {:mvn/version rewrite-clj-version}]]}))
 
 (defn- replace-in-file [fname match replacement]
   (let [orig-filename (str fname ".orig")
@@ -165,7 +165,7 @@
 (defn carve-patch [{:keys [home-dir rewrite-clj-version]}]
   (patch-deps {:filename (str (fs/file home-dir "deps.edn"))
                :removals #{'borkdude/rewrite-cljc}
-               :additions {'rewrite-clj/rewrite-clj {:mvn/version rewrite-clj-version}}})
+               :additions [['rewrite-clj/rewrite-clj {:mvn/version rewrite-clj-version}]]})
   (patch-rewrite-cljc-sources home-dir))
 
 ;;
@@ -184,7 +184,7 @@
 (defn- clojure-lsp-patch [{:keys [home-dir rewrite-clj-version]}]
   (patch-deps {:filename (str (fs/file home-dir "deps.edn"))
                   :removals #{'rewrite-clj/rewrite-clj}
-                  :additions {'rewrite-clj/rewrite-clj {:mvn/version rewrite-clj-version}}}))
+                  :additions [['rewrite-clj/rewrite-clj {:mvn/version rewrite-clj-version}]]}))
 
 ;;
 ;; cljstyle
@@ -201,7 +201,7 @@
 (defn depot-patch [{:keys [home-dir rewrite-clj-version]}]
   (patch-deps {:filename (str (fs/file home-dir "deps.edn"))
                :removals #{'rewrite-clj/rewrite-clj}
-               :additions {'rewrite-clj/rewrite-clj {:mvn/version rewrite-clj-version}}})
+               :additions [['rewrite-clj/rewrite-clj {:mvn/version rewrite-clj-version}]]})
   (patch-rewrite-cljc-sources home-dir)
   (status/line :detail "=> depot uses but does not require rewrite-clj.node, need to adjust for rewrite-clj v1")
   (replace-in-file (str (fs/file home-dir "src/depot/zip.clj"))
@@ -228,9 +228,6 @@
         ;; done with exercising my rewrite-clj skills for now! :-)
         (string/replace #"rewrite-clj \"[0-9.]+\""
                         (format "rewrite-clj \"%s\"" rewrite-clj-version))
-        ;; lein-ancient uses pedantic? :abort, so need to match clojure versions
-        (string/replace #"\[org.clojure/clojure .*\]"
-                        "[org.clojure/clojure \"1.10.3\" :scope \"provided\"]")
         (->> (spit p)))))
 
 ;;