Skip to content

Commit a38b560

Browse files
committed
Drop support for Nashorn
1 parent 2a579b9 commit a38b560

File tree

6 files changed

+11
-16
lines changed

6 files changed

+11
-16
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
* [#2826](https://github.com/clojure-emacs/cider/pull/2826): Add support for symbols with quotes and resolving of ns-aliased keywords in `cider-symbol-at-point`.
2121
* [#2617](https://github.com/clojure-emacs/cider/pull/2617): Add menu bar entry for `Insert last sexp in REPL`.
22+
* Removed support for the Nashorn ClojureScript REPL. (it was removed upstream in ClojureScript)
2223

2324
### Bugs fixed
2425

cider-connection.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ The following formats can be used in TEMPLATE string:
556556
%j - short project name, or directory name if no project
557557
%J - long project name including parent dir name
558558
%r - REPL type (clj or cljs)
559-
%S - type of the ClojureScript runtime (Nashorn, Node, Figwheel etc.)
559+
%S - type of the ClojureScript runtime (Browser, Node, Figwheel etc.)
560560
%s - session name as defined by `cider-session-name-template'.
561561
562562
In case some values are empty, extra separators (: and -) are automatically
@@ -620,7 +620,7 @@ Session name can be customized with `cider-session-name-template'."
620620
;;; REPL Buffer Init
621621

622622
(defvar-local cider-cljs-repl-type nil
623-
"The type of the ClojureScript runtime (Nashorn, Node etc.)")
623+
"The type of the ClojureScript runtime (Browser, Node, Figwheel, etc.)")
624624

625625
(defvar-local cider-repl-type nil
626626
"The type of this REPL buffer, usually either clj or cljs.")

cider.el

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -659,10 +659,6 @@ Generally you should not disable this unless you run into some faulty check."
659659
(unless (cider-library-present-p "cider.piggieback")
660660
(user-error "Piggieback 0.4.x (aka cider/piggieback) is not available. See https://docs.cider.mx/cider/basics/clojurescript for details")))
661661

662-
(defun cider-check-nashorn-requirements ()
663-
"Check whether we can start a Nashorn ClojureScript REPL."
664-
(cider-verify-piggieback-is-present))
665-
666662
(defun cider-check-node-requirements ()
667663
"Check whether we can start a Node ClojureScript REPL."
668664
(cider-verify-piggieback-is-present)
@@ -814,9 +810,7 @@ The supplied string will be wrapped in a do form if needed."
814810
(format "(do %s)" form)))))
815811

816812
(defvar cider-cljs-repl-types
817-
'((nashorn "(do (require 'cljs.repl.nashorn) (cider.piggieback/cljs-repl (cljs.repl.nashorn/repl-env)))"
818-
cider-check-nashorn-requirements)
819-
(figwheel "(do (require 'figwheel-sidecar.repl-api) (figwheel-sidecar.repl-api/start-figwheel!) (figwheel-sidecar.repl-api/cljs-repl))"
813+
'((figwheel "(do (require 'figwheel-sidecar.repl-api) (figwheel-sidecar.repl-api/start-figwheel!) (figwheel-sidecar.repl-api/cljs-repl))"
820814
cider-check-figwheel-requirements)
821815
(figwheel-main cider-figwheel-main-init-form cider-check-figwheel-main-requirements)
822816
(figwheel-connected "(figwheel-sidecar.repl-api/cljs-repl)"
@@ -865,9 +859,9 @@ This affects commands like `cider-jack-in-cljs'. Generally it's
865859
intended to be set via .dir-locals.el for individual projects, as its
866860
relatively unlikely you'd like to use the same type of REPL in each project
867861
you're working on."
868-
:type '(choice (const :tag "Nashorn" nashorn)
869-
(const :tag "Figwheel" figwheel)
862+
:type '(choice (const :tag "Figwheel" figwheel)
870863
(const :tag "Figwheel Main" figwheel-main)
864+
(const :tag "Browser" browser)
871865
(const :tag "Node" node)
872866
(const :tag "Weasel" weasel)
873867
(const :tag "Boot" boot)

doc/modules/ROOT/pages/cljs/configuration.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ NOTE: Modifying this variable will affect all ClojureScript REPL types.
2626

2727
If you frequently use the same ClojureScript REPL, you can set
2828
`cider-default-cljs-repl` and CIDER will skip the prompt and use this
29-
instead. For example, the following will make Nashorn the default:
29+
instead. For example, the following will make Node.js the default:
3030

3131
[source,lisp]
3232
----
33-
(setq cider-default-cljs-repl 'nashorn)
33+
(setq cider-default-cljs-repl 'node)
3434
----
3535

3636
== Defining Custom ClojureScript REPL Types

doc/modules/ROOT/pages/cljs/overview.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ debugger are currently Clojure-only features.
77

88
Unlike the Clojure ecosystem that is dominated by a single REPL, the
99
ClojureScript ecosystem has a number of different choices for REPLs
10-
(e.g. `nashorn`, `node`, `weasel`, `figwheel` and `shadow-cljs`). You'll have to
10+
(e.g. `browser`, `node`, `weasel`, `figwheel` and `shadow-cljs`). You'll have to
1111
decide which one you want to run and how you want CIDER to interact with it.
1212

1313
In this section we'll take a look at how ClojureScript support is implemented in CIDER,

doc/modules/ROOT/pages/cljs/up_and_running.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ require you to configure additional setup. For example, you'll need to
7777
have Node.js installed to be able to start a Node REPL.
7878

7979
TIP: The only ClojureScript REPL type that doesn't require any additional
80-
setup is the Nashorn REPL. Unfortunately it's going to be removed in
81-
future versions of the JDK.
80+
setup is the browser REPL. To use the Node.js REPL you'll need to install
81+
Node.js.
8282

8383
== Working with `.cljc` files
8484

0 commit comments

Comments
 (0)