Skip to content

misc maint #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 14, 2025
Merged

misc maint #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e699775
test-libs: use official rewrite-edn release
lread Feb 14, 2025
8c99812
testing: fix test-helper
lread Feb 14, 2025
25853fb
test & ci: bump deps
lread Feb 14, 2025
2a7b5ed
lint: appease eastwood warning
lread Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deps.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}

Expand Down
10 changes: 3 additions & 7 deletions script/test_libs.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]}
Expand Down
8 changes: 7 additions & 1 deletion test/rewrite_clj/zip/test_helper.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Loading