Skip to content

Commit 8803b49

Browse files
Stop shipping fipp with cider-nrepl
1 parent c1c63bc commit 8803b49

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## master (unreleased)
44

5+
* [#941](https://github.com/clojure-emacs/cider-nrepl/pull/941): Stop vendoring Fipp dependency.
6+
* [#941](https://github.com/clojure-emacs/cider-nrepl/pull/941): Default to orchard.pp printer when Fipp/Puget/Zprint is selected but not found on classpath.
7+
58
## 0.55.7 (2025-04-29)
69

710
* [#939](https://github.com/clojure-emacs/cider-nrepl/pull/939): Tracker: synchronize access to WeakHashMap cache to prevent infinite loops.

project.clj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
(def fipp-version "0.6.26")
2-
31
(def dev-test-common-profile
42
{:dependencies '[[org.clojure/clojurescript "1.11.60" :scope "provided"]
53
;; 1.3.7 and 1.4.7 are working, but we need 1.3.7 for JDK8
64
[ch.qos.logback/logback-classic "1.3.7"]
75
[mvxcvi/puget "1.3.4" :exclusions [org.clojure/clojure]]
6+
[fipp "0.6.26"]
87
[org.clojure/test.check "1.1.1"]
98
[cider/piggieback "0.6.0"]
109
[nubank/matcher-combinators "3.9.1"]]
@@ -23,7 +22,6 @@
2322
:scm {:name "git" :url "https://github.com/clojure-emacs/cider-nrepl"}
2423
:dependencies [[nrepl/nrepl "1.3.1" :exclusions [org.clojure/clojure]]
2524
[cider/orchard "0.34.3" :exclusions [org.clojure/clojure]]
26-
^:inline-dep [fipp ~fipp-version] ; can be removed in unresolved-tree mode
2725
^:inline-dep [compliment "0.7.0"]
2826
^:inline-dep [org.rksm/suitable "0.6.2" :exclusions [org.clojure/clojure
2927
org.clojure/clojurescript]]
@@ -49,8 +47,6 @@
4947
'[[thomasa/mranderson "0.5.4-SNAPSHOT"]])
5048

5149
:mranderson {:project-prefix "cider.nrepl.inlined.deps"
52-
:overrides {[fipp] [fipp ~fipp-version]} ; only takes effect in unresolved-tree mode
53-
:expositions [[fipp]] ; only takes effect unresolved-tree mode
5450
:unresolved-tree false}
5551

5652
:filespecs [{:type :bytes :path "cider/cider-nrepl/project.clj" :bytes ~(slurp "project.clj")}]

src/cider/nrepl/pprint.clj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,17 @@
6262
(pp/pprint writer value options)))
6363

6464
(def ^:private fipp-printer
65-
(delay (requiring-resolve 'fipp.edn/pprint)))
65+
(delay (try-resolve 'fipp.edn/pprint "Fipp")))
6666

6767
(defn fipp-pprint
6868
([value writer]
6969
(fipp-pprint value writer {}))
7070
([value writer options]
71-
(binding [*out* writer]
72-
(@fipp-printer value options))))
71+
(if-some [fipp @fipp-printer]
72+
(binding [*out* writer]
73+
(fipp value options))
74+
;; Default to orchard.pp/pprint if Fipp could not be loaded.
75+
(pp/pprint writer value options))))
7376

7477
(def ^:private puget-printer
7578
(delay (try-resolve 'puget.printer/pprint "Puget")))

0 commit comments

Comments
 (0)