branch: elpa/cider
commit b552681621f477f947bf39a3864878db8bd32e9f
Author: ikappaki <[email protected]>
Commit: Bozhidar Batsov <[email protected]>
Address review comments (remove obsolete option)
---
CHANGELOG.md | 1 -
cider.el | 15 ++-------------
doc/modules/ROOT/pages/platforms/basilisp.adoc | 2 ++
3 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7715364835..93429a3c77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,6 @@
- [#3624](https://github.com/clojure-emacs/cider/pull/3624): Support new
`cider.clj-reload/reload` cider-nrepl middleware.
- adds `cider-ns-code-reload-tool` defcustom, defaulting to
`'tools.namespace`.
- you can change it to `'clj-reload` to use
[clj-reload](https://github.com/tonsky/clj-reload) instead of
[tools.namespace](https://github.com/clojure/tools.namespace).
-
- [#3682](https://github.com/clojure-emacs/cider/issues/3682): Add
`cider-jack-in` support for
[Basilisp](https://github.com/basilisp-lang/basilisp) (Python)
### Changes
diff --git a/cider.el b/cider.el
index c533880835..1498636c0c 100644
--- a/cider.el
+++ b/cider.el
@@ -283,13 +283,6 @@ By default we favor the project-specific shadow-cljs over
the system-wide."
:safe #'stringp
:package-version '(cider . "1.14.0"))
-(defcustom cider-basilisp-global-options
- nil
- "Command line options used to execute Basilisp."
- :type 'string
- :safe #'stringp
- :package-version '(cider . "1.14.0"))
-
(defcustom cider-basilisp-parameters
"nrepl-server"
"Params passed to Basilisp to start an nREPL server via `cider-jack-in'."
@@ -304,7 +297,6 @@ By default we favor the project-specific shadow-cljs over
the system-wide."
(make-obsolete-variable 'cider-gradle-global-options 'cider-gradle-parameters
"1.8.0")
(make-obsolete-variable 'cider-babashka-global-options
'cider-babashka-parameters "1.8.0")
(make-obsolete-variable 'cider-nbb-global-options 'cider-nbb-parameters
"1.8.0")
-(make-obsolete-variable 'cider-basilip-global-options
'cider-basilisp-parameters "1.8.0")
(defcustom cider-jack-in-default
(if (executable-find "clojure") 'clojure-cli 'lein)
@@ -518,7 +510,7 @@ Throws an error if PROJECT-TYPE is unknown."
('shadow-cljs cider-shadow-cljs-global-options)
('gradle cider-gradle-global-options)
('nbb cider-nbb-global-options)
- ('basilisp cider-basilisp-global-options)
+ ('basilisp nil)
(_ (user-error "Unsupported project type `%S'" project-type))))
(defun cider-jack-in-params (project-type)
@@ -995,10 +987,7 @@ middleware and dependencies."
global-opts
(unless (seq-empty-p global-opts) " ")
params))
- ('basilisp (concat
- global-opts
- (unless (seq-empty-p global-opts) " ")
- params))
+ ('basilisp params)
(_ (error "Unsupported project type `%S'" project-type))))
diff --git a/doc/modules/ROOT/pages/platforms/basilisp.adoc
b/doc/modules/ROOT/pages/platforms/basilisp.adoc
index 03e0685d25..4bef08daa4 100644
--- a/doc/modules/ROOT/pages/platforms/basilisp.adoc
+++ b/doc/modules/ROOT/pages/platforms/basilisp.adoc
@@ -1,6 +1,8 @@
= Basilisp Integration with CIDER
https://github.com/basilisp-lang/basilisp[basilisp]
+since CIDER 1.14
+
== Overview
Basilisp aims to enable writing Clojure programs on Python with full Python
interoperability. It is highly compatible with Clojure.
