Bump Orchard version

Author: alexander-yakushev

.circleci/config.yml

@@ -175,13 +175,12 @@ workflows:
             <<: *tags_filter
       - test:
           # We have source for JDK21, so with this JDK version we also perform
-          # Java parser tests (for both regular parser and parser-next).
+          # Java parser tests.
           matrix:
             alias: "test_with_sources"
             parameters:
               clojure_version: ["1.10", "1.11", "1.12"]
               jdk_version: [jdk21]
-              parser_target: ["parser", "parser-next"]
           filters:
             branches:
               only: /.*/

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## master (unreleased)
 
+* Bump `orchard` to [0.28.0](https://github.com/clojure-emacs/orchard/blob/master/CHANGELOG.md#0280-2024-10-31).
 * [#885 (partial)](https://github.com/clojure-emacs/cider-nrepl/issues/885): Limited update to `info` op doc (`arglists-str`, `file`, `line`, `column`, `name` and `ns` return keys).
 
 ## 0.50.2 (2024-09-03)

Makefile

@@ -40,11 +40,7 @@ target/srcdeps: project.clj
 	rm -f target/srcdeps/cider/nrepl/inlined/deps/cljfmt/*/cljfmt/main.clj
 
 test_impl: base-src.zip
-	@if [[ "$$PARSER_TARGET" == "parser-next" ]] ; then \
-		lein with-profile $(TEST_PROFILES),+$(CLOJURE_VERSION),+parser-next test; \
-	else \
-		lein with-profile $(TEST_PROFILES),+$(CLOJURE_VERSION) test; \
-	fi
+		lein with-profile $(TEST_PROFILES),+$(CLOJURE_VERSION) test
 
 test: target/srcdeps
 	@make test_impl TEST_PROFILES="$(TEST_PROFILES),+plugin.mranderson/config"

project.clj

@@ -51,7 +51,7 @@
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :scm {:name "git" :url "https://github.com/clojure-emacs/cider-nrepl"}
   :dependencies [[nrepl "1.1.1" :exclusions [org.clojure/clojure]]
-                 [cider/orchard "0.27.2" :exclusions [org.clojure/clojure]]
+                 [cider/orchard "0.28.0" :exclusions [org.clojure/clojure]]
                  ^:inline-dep [mx.cider/haystack "0.3.3" :exclusions [cider/orchard]]
                  ^:inline-dep [thunknyc/profile "0.5.2"]
                  ^:inline-dep [mvxcvi/puget "1.3.4" :exclusions [org.clojure/clojure]]
@@ -140,9 +140,6 @@
                                                                   commons-codec
                                                                   com.google.code.findbugs/jsr305]]))
 
-             :parser-next {:jvm-opts ["--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"
-                                      "--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"]}
-
              ;; Need ^:repl because of: https://github.com/technomancy/leiningen/issues/2132
              :repl ^:repl [:test
                            {:repl-options {:nrepl-middleware [cider.nrepl/wrap-apropos

src/cider/nrepl.clj

@@ -47,7 +47,7 @@
 ;; Perform the underlying dynamic `require`s asap, and also not within a separate thread
 ;; (note the `future` used in `#'initializer`),
 ;; since `require` is not thread-safe:
-@@orchard.java/parser-next-available?
+(orchard.java/source-info `String)
 @analyzer/spec-abbrev
 
 (defn warmup-orchard-caches!

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

@@ -166,7 +166,7 @@
         (is (= "a macro for testing" (:doc response)))
         (is (nil? (:spec response)))))
 
-    (when (and jdk-sources-present? @@orchard.java/parser-next-available?)
+    (when jdk-sources-present?
       (testing "'fragments' attributes are returned"
         (let [{:keys [doc-fragments doc-first-sentence-fragments doc-block-tags-fragments]
                :as response}
@@ -412,7 +412,7 @@
             (is (not (contains? response :ns)))
             (is (= "function" (:type response)))))))
 
-    (when @@orchard.java/parser-next-available?
+    (when jdk-sources-present?
       (testing "Fragments for java interop method with single class"
         (let [{:keys [doc-fragments doc-first-sentence-fragments doc-block-tags-fragments]
                :as response}

test/clj/cider/nrepl/middleware/inspect_test.clj

@@ -762,8 +762,8 @@
     (is (= 7 @inspect-tap-current-value-test-atom))))
 
 (deftest doc-fragments-test
-  ;; This test is only runnable when JDK sources are present and with parser-next.
-  (when (and info-test/jdk-sources-present? @@orchard.java/parser-next-available?)
+  ;; This test is only runnable when JDK sources are present.
+  (when info-test/jdk-sources-present?
     (testing "Responses for classes, methods and fields contain `:doc-fragments` attributes"
       (doseq [code ["java.lang.Thread"
                     "(-> java.lang.Thread .getMethods first)"

test/cljs/cider/nrepl/middleware/cljs_inspect_test.clj

@@ -13,6 +13,8 @@
   '("Class: "
     (:value "clojure.lang.Cons" 0)
     (:newline)
+    "Count: " "2"
+    (:newline)
     (:newline)
     "--- Contents:"
     (:newline)