Merge pull request #348 from clj-commons/lread-misc-2025-02-14

misc maint

Author: lread

deps.edn

@@ -36,7 +36,7 @@
            {;; for disabling the official compiler
             :classpath-overrides {org.clojure/clojure nil}
             :extra-deps {com.github.flow-storm/clojure {:mvn/version "1.12.0-3"}
-                         com.github.flow-storm/flow-storm-dbg {:mvn/version "4.1.1"}}
+                         com.github.flow-storm/flow-storm-dbg {:mvn/version "4.1.2"}}
             :jvm-opts ["-Dclojure.storm.instrumentEnable=true"]}
 
            :nrepl/jvm
@@ -156,7 +156,7 @@
            ;;
            ;; Deployment
            ;;
-           :build {:deps {io.github.clojure/tools.build {:mvn/version "0.10.6"}}
+           :build {:deps {io.github.clojure/tools.build {:mvn/version "0.10.7"}}
                    :extra-paths ["src" "build"]
                    :ns-default build}
 

script/test_libs.clj

@@ -412,15 +412,11 @@
             :show-deps-fn cli-deps-tree
             :test-cmds ["clojure -M:test"]}
            {:name "rewrite-edn"
-            ;; very temporarily use sha of my PR that addresses failure
-            ;; move back to release when PR is merged
-            :version "5659a1f650514d18c2356edeca16662e860ddd92"
+            :version "0.4.9"
             :platforms [:clj]
             :github-release {:repo "borkdude/rewrite-edn"
-                             ;; very temporarily use sha of PR that addresses failure
-                             ;; :version-prefix "v"
-                             ;; :via :tag
-                             :via :sha}
+                             :version-prefix "v"
+                             :via :tag}
             :patch-fn deps-edn-v1-patch
             :show-deps-fn cli-deps-tree
             :test-cmds ["clojure -M:test"]}

test/rewrite_clj/zip/test_helper.cljc

@@ -52,8 +52,14 @@
          rows 0]
     (if (not zloc)
       (inc rows)
-      (if (or (z/linebreak? zloc) (n/comment? (z/node zloc)))
+      (cond
+        (z/linebreak? zloc)
+        (recur (z/prev* zloc) (long (+ rows (z/length zloc))))
+
+        (n/comment? (z/node zloc))
         (recur (z/prev* zloc) (inc rows))
+
+        :else
         (recur (z/prev* zloc) rows)))))
 
 (defn- col-num [zloc]