Skip to content

Commit 1ec91b6

Browse files
Bump Orchard version
1 parent 04ff84a commit 1ec91b6

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## master (unreleased)
44

5+
* Bump `orchard` to [0.29.0](https://github.com/clojure-emacs/orchard/blob/master/CHANGELOG.md#0290-2024-12-31).
6+
- **BREAKING**: Drop support for Java sources parsing on JDK8.
7+
- Rework Java sources discovery.
8+
59
## 0.50.3 (2024-12-02)
610

711
* Bump `orchard` to [0.28.0](https://github.com/clojure-emacs/orchard/blob/master/CHANGELOG.md#0280-2024-10-31).

project.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
:url "http://www.eclipse.org/legal/epl-v10.html"}
5252
:scm {:name "git" :url "https://github.com/clojure-emacs/cider-nrepl"}
5353
:dependencies [[nrepl/nrepl "1.3.1" :exclusions [org.clojure/clojure]]
54-
[cider/orchard "0.28.0" :exclusions [org.clojure/clojure]]
54+
[cider/orchard "0.29.0" :exclusions [org.clojure/clojure]]
5555
^:inline-dep [mx.cider/haystack "0.3.3" :exclusions [cider/orchard]]
5656
^:inline-dep [thunknyc/profile "0.5.2"]
5757
^:inline-dep [mvxcvi/puget "1.3.4" :exclusions [org.clojure/clojure]]

test/clj/cider/nrepl/middleware/info_test.clj

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,9 @@
217217
(pr-str response))
218218
(is (= "cider.nrepl.test.TestClass" (:class response)))
219219
(is (= "doSomething" (:member response)))
220-
(is (= "[a b c]" (:arglists-str response)))
220+
(when (SystemUtils/IS_JAVA_9)
221+
;; Java source parsing is only supported in JDK11+.
222+
(is (= "[a b c]" (:arglists-str response))))
221223
(is (= ["int" "int" "java.lang.String"]
222224
(:argtypes response)))
223225
(is (= "void" (:returns response)))
@@ -432,14 +434,16 @@
432434
(is (not (contains? response :ns)))
433435
(is (= "function" (:type response)))))
434436

435-
(testing "java method eldoc lookup, internal testing methods"
436-
(let [response (session/message {:op "eldoc" :sym "fnWithSameName" :ns "cider.nrepl.middleware.info-test"})]
437-
(is (= #{["this"]
438-
["a" "b" "c"]
439-
["this" "prim" "things" "generic"]}
440-
(set (:eldoc response)))
441-
(pr-str response))
442-
(is (= "function" (:type response)))))))
437+
(when (SystemUtils/IS_JAVA_9)
438+
;; Java source parsing is only supported in JDK11+.
439+
(testing "java method eldoc lookup, internal testing methods"
440+
(let [response (session/message {:op "eldoc" :sym "fnWithSameName" :ns "cider.nrepl.middleware.info-test"})]
441+
(is (= #{["this"]
442+
["a" "b" "c"]
443+
["this" "prim" "things" "generic"]}
444+
(set (:eldoc response)))
445+
(pr-str response))
446+
(is (= "function" (:type response))))))))
443447

444448
(deftest missing-info-test
445449
(testing "ensure info returns a no-info packet if symbol not found"

0 commit comments

Comments
 (0)