Skip to content

Fix most of the build #3165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 5, 2022
Merged

Fix most of the build #3165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
955535e
Fix syntax for a test
vemv Mar 5, 2022
4082f6f
Satisfy linters
vemv Mar 5, 2022
c2712cf
Adapt some tests
vemv Mar 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cider-repl.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,8 +711,8 @@ namespaces. STRING is REPL's output."
string)

(defvar cider-repl-preoutput-hook `(,(if (< emacs-major-version 29)
'cider-repl--ansi-color-apply
'ansi-color-apply)
'cider-repl--ansi-color-apply
'ansi-color-apply)
cider-repl-highlight-current-project
cider-repl-highlight-spec-keywords
cider-repl-add-locref-help-echo)
Expand Down
3 changes: 2 additions & 1 deletion cider.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ returned by this function does not include keyword arguments."
`(("cider/cider-nrepl" ,cider-injected-middleware-version)
("mx.cider/enrich-classpath" "1.9.0")))
(append cider-jack-in-lein-plugins
`(("cider/cider-nrepl" ,cider-injected-middleware-version))))))
`(("cider/cider-nrepl" ,cider-injected-middleware-version))))))
(thread-last plugins
(seq-filter
(lambda (spec)
Expand Down Expand Up @@ -609,6 +609,7 @@ removed, LEIN-PLUGINS, LEIN-MIDDLEWARES and finally PARAMS."
params))

(defun cider--dedupe-deps (deps)
"Removes the duplicates in DEPS."
(cl-delete-duplicates deps :test 'equal))

(defun cider-clojure-cli-jack-in-dependencies (global-options _params dependencies)
Expand Down
30 changes: 17 additions & 13 deletions test/cider-tests.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@
(before-each
;; FIXME: Needed because its set in an earlier test
(setq-local cider-jack-in-lein-plugins nil)
(setq-local cider-jack-in-dependencies nil)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar to the ones above per Needed because its set in an earlier test

(setq-local cider-jack-in-nrepl-middlewares '("cider.nrepl/cider-middleware"))
(setq-local cider-jack-in-dependencies-exclusions '()))
(it "can concat in a lein project"
Expand Down Expand Up @@ -397,6 +398,7 @@
"YwBsAG8AagB1AHIAZQAgACIAIgBjAG0AZAAtAHAAYQByAGEAbQBzACIAIgA="))))
(describe "when 'clojure-cli project type"
(it "uses main opts in an alias to prevent other mains from winning"
(setq-local cider-jack-in-dependencies nil)
(setq-local cider-jack-in-nrepl-middlewares '("cider.nrepl/cider-middleware"))
(let ((expected (string-join '("clojure -Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} "
"cider/cider-nrepl {:mvn/version \"0.28.3\"}} "
Expand All @@ -411,12 +413,14 @@
(spy-on 'cider-jack-in-resolve-command :and-return-value "clojure")
(expect (plist-get (cider--update-jack-in-cmd nil) :jack-in-cmd)
:to-equal expected)))

(it "allows specifying custom aliases with `cider-clojure-cli-aliases`"
(let ((expected (string-join '("clojure -Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} "
"cider/cider-nrepl {:mvn/version \"0.28.3\"}} "
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:dev:test:cider/nrepl")
"")))
(setq-local cider-jack-in-dependencies nil)
(setq-local cider-clojure-cli-aliases "-A:dev:test")
(setq-local cider-allow-jack-in-without-project t)
(setq-local cider-clojure-cli-command "clojure")
Expand All @@ -425,18 +429,18 @@
(spy-on 'cider-jack-in-resolve-command :and-return-value "clojure")
(expect (plist-get (cider--update-jack-in-cmd nil) :jack-in-cmd)
:to-equal expected)))
(let ((expected (string-join '("-Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} "
"cider/cider-nrepl {:mvn/version \"0.28.3\"}} "
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:cider/nrepl")
"")))
(describe "should remove duplicates, yielding the same result"
(expect (cider-clojure-cli-jack-in-dependencies nil nil '(("nrepl/nrepl" "0.9.0")
("nrepl/nrepl" "0.9.0")))
:to-equal expected)))
(it "should remove duplicates, yielding the same result"
(let ((expected (string-join '("-Sdeps '{:deps {cider/cider-nrepl {:mvn/version \"0.28.3\"} "
"nrepl/nrepl {:mvn/version \"0.9.0\"}} "
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:dev:test:cider/nrepl")
"")))
(expect (cider-clojure-cli-jack-in-dependencies nil nil '(("nrepl/nrepl" "0.9.0")
("nrepl/nrepl" "0.9.0")))
:to-equal expected)))
(it "handles aliases correctly"
(let ((expected (string-join '("-Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} "
"cider/cider-nrepl {:mvn/version \"0.28.3\"}} "
(let ((expected (string-join '("-Sdeps '{:deps {cider/cider-nrepl {:mvn/version \"0.28.3\"} "
"nrepl/nrepl {:mvn/version \"0.9.0\"}} "
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:test:cider/nrepl")
""))
Expand All @@ -458,8 +462,8 @@
(expect (cider-clojure-cli-jack-in-dependencies nil nil deps)
:to-equal expected)))))
(it "allows for global options"
(let ((expected (string-join '("-J-Djdk.attach.allowAttachSelf -Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} "
"cider/cider-nrepl {:mvn/version \"0.28.3\"}} "
(let ((expected (string-join '("-J-Djdk.attach.allowAttachSelf -Sdeps '{:deps {cider/cider-nrepl {:mvn/version \"0.28.3\"} "
"nrepl/nrepl {:mvn/version \"0.9.0\"}} "
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:test:cider/nrepl")
""))
Expand Down