diff options
author | Bozhidar Batsov <bozhidar@batsov.com> | 2018-08-22 11:52:17 +0200 |
---|---|---|
committer | Bozhidar Batsov <bozhidar@batsov.com> | 2018-08-22 11:52:17 +0200 |
commit | 5cf0f6f04697d598b20d1f6b68588db43c433614 (patch) | |
tree | 3e2426a60d87e29d0fb5c8f404df4a05a844f92e | |
parent | 672d6f3589e1c9e717ed8217a451cb4dbe148d3d (diff) |
Rename cider-default-repl-command to cider-jack-in-default
-rw-r--r-- | CHANGELOG.md | 1 | ||||
-rw-r--r-- | cider.el | 16 | ||||
-rw-r--r-- | doc/up_and_running.md | 5 | ||||
-rw-r--r-- | test/cider-tests.el | 4 |
4 files changed, 16 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 44f5bd8a..963ce2ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -503,6 +503,7 @@ and try to associate the created connection with this project automatically. * [#1422](https://github.com/clojure-emacs/cider/issues/1422): Don't display mismatching parens error on incomplete expressions in REPL buffers. * [#1412](https://github.com/clojure-emacs/cider/issues/1412): nREPL messages for separate sessions are tracked in separate buffers. * Removed `cider-switch-to-repl-command`. +* Renamed `cider-default-repl-command` to `cider-jack-in-default`. ### Bugs fixed @@ -214,17 +214,23 @@ By default we favor the project-specific shadow-cljs over the system-wide." :safe #'stringp :package-version '(cider . "0.10.0")) -(defcustom cider-default-repl-command "clojure-cli" - "The default command and parameters to use when connecting to nREPL. +(defcustom cider-jack-in-default "clojure-cli" + "The default tool to use when doing `cider-jack-in' outside a project. This value will only be consulted when no identifying file types, i.e. project.clj for leiningen or build.boot for boot, could be found. -As tools.deps is bundled with Clojure itself, it's the default REPL command." - :type 'string +As the Clojure CLI is bundled with Clojure itself, it's the default." + :type '(choice (const "lein") + (const "boot") + (const "clojure-cli") + (const "shadow-cljs") + (const "gradle")) :group 'cider :safe #'stringp :package-version '(cider . "0.9.0")) +(define-obsolete-variable-alias 'cider-default-repl-command 'cider-jack-in-default) + (defcustom cider-preferred-build-tool nil "Allow choosing a build system when there are many. @@ -1363,7 +1369,7 @@ PROJECT-DIR defaults to the current project." choices nil t nil nil default)) (choices (car choices)) - (t cider-default-repl-command)))) + (t cider-jack-in-default)))) ;; TODO: Implement a check for command presence over tramp diff --git a/doc/up_and_running.md b/doc/up_and_running.md index 51b627b7..8d7861e6 100644 --- a/doc/up_and_running.md +++ b/doc/up_and_running.md @@ -62,9 +62,8 @@ Note that if you try to run `cider-jack-in` outside a project directory normally you'd get a warning to confirm you really want to do this, as more often than not you'd probably do this accidentally. If you decide to proceed, CIDER will invoke the command -configured in `cider-default-repl-command`. This used to be `lein -repl` prior to CIDER 0.17 and it was switched to Clojure's CLI (`clj`) -afterwards. +configured in `cider-jack-in-default`. This used to be `lein` prior to +CIDER 0.17 and it was switched to Clojure's CLI (`clj`) afterwards. !!! Tip diff --git a/test/cider-tests.el b/test/cider-tests.el index 070557a4..93e85b41 100644 --- a/test/cider-tests.el +++ b/test/cider-tests.el @@ -202,10 +202,10 @@ (expect (cider-project-type) :to-equal "build2")))) (describe "when there are no choices available" - (it "returns the value of `cider-default-repl-command'" + (it "returns the value of `cider-jack-in-default'" (spy-on 'cider--identify-buildtools-present :and-return-value '()) - (expect (cider-project-type) :to-equal cider-default-repl-command)))) + (expect (cider-project-type) :to-equal cider-jack-in-default)))) (describe "cider-normalize-cljs-init-options" (describe "from options" |