[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/cider 73f0d05160: Ensure there's a leading `:` when using
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/cider 73f0d05160: Ensure there's a leading `:` when using `cider-clojure-cli-aliases` (#3426) |
Date: |
Thu, 24 Aug 2023 03:59:06 -0400 (EDT) |
branch: elpa/cider
commit 73f0d05160ccd7c5a4ea9f794137d41bf9ae5449
Author: vemv <vemv@users.noreply.github.com>
Commit: GitHub <noreply@github.com>
Ensure there's a leading `:` when using `cider-clojure-cli-aliases` (#3426)
---
CHANGELOG.md | 1 +
cider.el | 5 ++++-
dev/tramp-sample-project/README.md | 2 +-
test/cider-tests.el | 8 +++++++-
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cba6dd11ed..34d0b8d89a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
- [#3419](https://github.com/clojure-emacs/cider/issues/3419): Also match
friendly sessions based on the buffer's ns form.
- `cider-test`: only show diffs for collections.
- [#3375](https://github.com/clojure-emacs/cider/pull/3375): `cider-test`:
don't render a newline between expected and actual, most times.
+- Ensure there's a leading `:` when using `cider-clojure-cli-aliases`.
- Improve `nrepl-dict` error reporting.
- Bump the injected `piggieback` to
[0.5.3](https://github.com/nrepl/piggieback/blob/0.5.3/CHANGES.md#053-2021-10-26).
- Bump the injected `cider-nrepl` to
[0.36.0](https://github.com/clojure-emacs/cider-nrepl/blob/v0.36.0/CHANGELOG.md#0360-2023-08-21).
diff --git a/cider.el b/cider.el
index 5b455dba1d..c5396c651b 100644
--- a/cider.el
+++ b/cider.el
@@ -804,7 +804,10 @@ your aliases contain any mains, the cider/nrepl one will
be the one used."
(if cider-clojure-cli-aliases
;; remove exec-opts flags -A -M -T or -X from
cider-clojure-cli-aliases
;; concatenated with :cider/nrepl to ensure :cider/nrepl comes
last
- (format "%s" (replace-regexp-in-string "^-\\(A\\|M\\|T\\|X\\)"
"" cider-clojure-cli-aliases))
+ (let ((aliases (format "%s" (replace-regexp-in-string
"^-\\(A\\|M\\|T\\|X\\)" "" cider-clojure-cli-aliases))))
+ (if (string-prefix-p ":" aliases)
+ aliases
+ (concat ":" aliases)))
"")
(if params (format " %s" params) ""))))
diff --git a/dev/tramp-sample-project/README.md
b/dev/tramp-sample-project/README.md
index c731ed072d..3f70dd101b 100644
--- a/dev/tramp-sample-project/README.md
+++ b/dev/tramp-sample-project/README.md
@@ -7,7 +7,7 @@ This way, for development purposes, we can SSH into it with
TRAMP and exercise C
To get started:
* In one terminal tab, run `make run` to run the Docker image
-* Once it's ready, from another tab, run `make ssh`
+* Once it's ready, from another tab, run `make ssh` and start a repl manually
from there
* The password is `cider`
* `cd /usr/src/app; lein repl :headless :host 0.0.0.0 :port 7888`
diff --git a/test/cider-tests.el b/test/cider-tests.el
index a4350d6e4d..73befdf37a 100644
--- a/test/cider-tests.el
+++ b/test/cider-tests.el
@@ -495,7 +495,13 @@
(let ((cider-clojure-cli-aliases ":test"))
(expect (cider-clojure-cli-jack-in-dependencies nil nil deps)
:to-equal expected))
- (describe "should strip out leading exec opts -A -M -T -X"
+ (describe "should strip out leading exec opts -A -M -T -X, and ensure
there's a leading :"
+ (let ((cider-clojure-cli-aliases ":test"))
+ (expect (cider-clojure-cli-jack-in-dependencies nil nil deps)
+ :to-equal expected))
+ (let ((cider-clojure-cli-aliases "test"))
+ (expect (cider-clojure-cli-jack-in-dependencies nil nil deps)
+ :to-equal expected))
(let ((cider-clojure-cli-aliases "-A:test"))
(expect (cider-clojure-cli-jack-in-dependencies nil nil deps)
:to-equal expected))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [nongnu] elpa/cider 73f0d05160: Ensure there's a leading `:` when using `cider-clojure-cli-aliases` (#3426),
ELPA Syncer <=