Skip to content

Commit 5cf0f6f

Browse files
committed
Rename cider-default-repl-command to cider-jack-in-default
1 parent 672d6f3 commit 5cf0f6f

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,7 @@ and try to associate the created connection with this project automatically.
503503
* [#1422](https://github.com/clojure-emacs/cider/issues/1422): Don't display mismatching parens error on incomplete expressions in REPL buffers.
504504
* [#1412](https://github.com/clojure-emacs/cider/issues/1412): nREPL messages for separate sessions are tracked in separate buffers.
505505
* Removed `cider-switch-to-repl-command`.
506+
* Renamed `cider-default-repl-command` to `cider-jack-in-default`.
506507

507508
### Bugs fixed
508509

cider.el

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,17 +214,23 @@ By default we favor the project-specific shadow-cljs over the system-wide."
214214
:safe #'stringp
215215
:package-version '(cider . "0.10.0"))
216216

217-
(defcustom cider-default-repl-command "clojure-cli"
218-
"The default command and parameters to use when connecting to nREPL.
217+
(defcustom cider-jack-in-default "clojure-cli"
218+
"The default tool to use when doing `cider-jack-in' outside a project.
219219
This value will only be consulted when no identifying file types, i.e.
220220
project.clj for leiningen or build.boot for boot, could be found.
221221
222-
As tools.deps is bundled with Clojure itself, it's the default REPL command."
223-
:type 'string
222+
As the Clojure CLI is bundled with Clojure itself, it's the default."
223+
:type '(choice (const "lein")
224+
(const "boot")
225+
(const "clojure-cli")
226+
(const "shadow-cljs")
227+
(const "gradle"))
224228
:group 'cider
225229
:safe #'stringp
226230
:package-version '(cider . "0.9.0"))
227231

232+
(define-obsolete-variable-alias 'cider-default-repl-command 'cider-jack-in-default)
233+
228234
(defcustom cider-preferred-build-tool
229235
nil
230236
"Allow choosing a build system when there are many.
@@ -1363,7 +1369,7 @@ PROJECT-DIR defaults to the current project."
13631369
choices nil t nil nil default))
13641370
(choices
13651371
(car choices))
1366-
(t cider-default-repl-command))))
1372+
(t cider-jack-in-default))))
13671373

13681374

13691375
;; TODO: Implement a check for command presence over tramp

doc/up_and_running.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,8 @@ Note that if you try to run `cider-jack-in` outside a project
6262
directory normally you'd get a warning to confirm you really want to
6363
do this, as more often than not you'd probably do this
6464
accidentally. If you decide to proceed, CIDER will invoke the command
65-
configured in `cider-default-repl-command`. This used to be `lein
66-
repl` prior to CIDER 0.17 and it was switched to Clojure's CLI (`clj`)
67-
afterwards.
65+
configured in `cider-jack-in-default`. This used to be `lein` prior to
66+
CIDER 0.17 and it was switched to Clojure's CLI (`clj`) afterwards.
6867

6968
!!! Tip
7069

test/cider-tests.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,10 +202,10 @@
202202
(expect (cider-project-type) :to-equal "build2"))))
203203

204204
(describe "when there are no choices available"
205-
(it "returns the value of `cider-default-repl-command'"
205+
(it "returns the value of `cider-jack-in-default'"
206206
(spy-on 'cider--identify-buildtools-present
207207
:and-return-value '())
208-
(expect (cider-project-type) :to-equal cider-default-repl-command))))
208+
(expect (cider-project-type) :to-equal cider-jack-in-default))))
209209

210210
(describe "cider-normalize-cljs-init-options"
211211
(describe "from options"

0 commit comments

Comments
 (0)