branch: elpa/inf-clojure
commit 94810c380020358f03f8d1004f6492bcc2241c03
Author: Bozhidar Batsov <[email protected]>
Commit: Bozhidar Batsov <[email protected]>
Drop lein-clr REPL type
lein-clr has been abandonware for years. ClojureCLR users should use
clr.tools.deps instead.
---
CHANGELOG.md | 1 +
README.md | 4 ++--
inf-clojure.el | 7 +------
test/inf-clojure-tests.el | 8 +++-----
4 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcab51a92f..ae94bf3bb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
- Unify `reload` and `reload-all` forms with `inf-clojure-repl-features`,
enabling per-REPL-type dispatch. The standalone `inf-clojure-reload-form` and
`inf-clojure-reload-all-form` defcustoms have been removed.
- Deduplicate Clojure-family REPL feature definitions via a shared base alist.
- [#143](https://github.com/clojure-emacs/inf-clojure/issues/143):
`inf-clojure-show-arglists` now displays results in the REPL buffer instead of
the minibuffer.
+- Drop support for `lein-clr` (abandonware).
### Bugs fixed
diff --git a/README.md b/README.md
index 3f7604b903..60fc581155 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ It supports the following REPLs:
- Clojure
- ClojureScript
-- ClojureCLR (via [clr.tools.deps](https://github.com/clojure/clr.tools.deps)
or [lein-clr](https://github.com/kumarshantanu/lein-clr))
+- ClojureCLR (via [clr.tools.deps](https://github.com/clojure/clr.tools.deps))
- [Planck](http://planck-repl.org/)
- [Joker](https://joker-lang.org/)
- [babashka](https://github.com/borkdude/babashka)
@@ -446,7 +446,7 @@ obtained from `inf-clojure-repl-features`:
```emacs-lisp
(mapcar 'car inf-clojure-repl-features)
-;; => (cljs planck joker babashka node-babashka clojure clojure-clr lein-clr)
+;; => (cljs planck joker babashka node-babashka clojure clojure-clr)
```
What does it mean that a REPL type is supported? Well, it means that
diff --git a/inf-clojure.el b/inf-clojure.el
index dc843b8ca5..3d25fd9392 100644
--- a/inf-clojure.el
+++ b/inf-clojure.el
@@ -78,7 +78,6 @@
(clojure . "clojure")
(cljs . "clojure -M -m cljs.main -r")
(clojure-clr . "Clojure.Main")
- (lein-clr . "lein clr repl")
(planck . "planck -d")
(babashka . "bb")
(joker . "joker")))
@@ -155,10 +154,7 @@ via `inf-clojure--merge-repl-features'.")
inf-clojure--clojure-repl-base-features
'((arglists .
"(try (-> '%s clojure.core/resolve
clojure.core/meta :arglists) (catch Exception e nil))"))))
- (lein-clr . ,(inf-clojure--merge-repl-features
- inf-clojure--clojure-repl-base-features
- '((arglists .
- "(try (-> '%s clojure.core/resolve
clojure.core/meta :arglists) (catch Exception e nil))"))))))
+))
(defvar-local inf-clojure-repl-type nil
"Symbol to define your REPL type.
@@ -924,7 +920,6 @@ EVENT is the event that triggered this function to be
called."
(boot . "export BOOT_JVM_OPTIONS='-Dclojure.server.repl=\"{:port %d
:accept clojure.core.server/repl}\"' boot repl")
(clojure . "clojure -J-Dclojure.server.repl=\"{:port %d :accept
clojure.core.server/repl}\"")
(cljs . "clojure -J-Dclojure.server.repl=\"{:port %d :accept
cljs.server.browser/repl}\"")
- (lein-clr . "JVM_OPTS='-Dclojure.server.repl={:port %d :accept
clojure.core.server/repl}' lein clr repl")
(planck . "planck -n %d")
(babashka . "bb socket-repl %d")))
diff --git a/test/inf-clojure-tests.el b/test/inf-clojure-tests.el
index 5ace111001..5ff7ff32df 100644
--- a/test/inf-clojure-tests.el
+++ b/test/inf-clojure-tests.el
@@ -174,7 +174,7 @@ is a string\")
(let ((base-features '(load doc source apropos ns-vars set-ns
macroexpand macroexpand-1 arglists
reload reload-all var-meta)))
- (dolist (repl-type '(clojure clojure-clr babashka node-babashka
lein-clr))
+ (dolist (repl-type '(clojure clojure-clr babashka node-babashka))
(dolist (feature base-features)
(expect (inf-clojure--get-feature repl-type feature nil)
:not :to-be nil)))))
@@ -187,7 +187,7 @@ is a string\")
(bb-arglists (inf-clojure--get-feature 'babashka 'arglists nil)))
(expect clj-arglists :to-equal bb-arglists)))
(it "provides reload, reload-all and var-meta for all REPL types"
- (dolist (repl-type '(clojure clojure-clr babashka node-babashka lein-clr
cljs planck joker))
+ (dolist (repl-type '(clojure clojure-clr babashka node-babashka cljs
planck joker))
(expect (inf-clojure--get-feature repl-type 'reload nil)
:not :to-be nil)
(expect (inf-clojure--get-feature repl-type 'reload-all nil)
@@ -196,10 +196,8 @@ is a string\")
:not :to-be nil)))
(it "uses a different arglists catch clause for CLR REPL types"
(let ((clj-arglists (inf-clojure--get-feature 'clojure 'arglists nil))
- (clr-arglists (inf-clojure--get-feature 'clojure-clr 'arglists nil))
- (lein-clr-arglists (inf-clojure--get-feature 'lein-clr 'arglists
nil)))
+ (clr-arglists (inf-clojure--get-feature 'clojure-clr 'arglists nil)))
(expect clj-arglists :not :to-equal clr-arglists)
- (expect clr-arglists :to-equal lein-clr-arglists)
(expect clr-arglists :to-match "Exception"))))
(describe "inf-clojure--get-feature"
