Skip to content

Commit 53f9ffb

Browse files
committed
Fix clojure.core function highlighting on ClojureScript
Part of #3385
1 parent cc31f5b commit 53f9ffb

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- [#3355](https://github.com/clojure-emacs/cider/pull/3355): Fix `cider-mode` disabling itself after a disconnect when `cider-auto-mode` is set to nil.
1919
- [#3362](https://github.com/clojure-emacs/cider/issues/3362): Fix `sesman-restart` regression issue.
2020
- [#3236](https://github.com/clojure-emacs/cider/issues/3236): `cider-repl-set-ns` no longer changes the repl session type from `cljs:shadow` to `clj`.
21+
- [#3385](https://github.com/clojure-emacs/cider/issues/3385): Fix `clojure.core` function highlighting on ClojureScript.
2122

2223
### Changes
2324

cider-resolve.el

+2-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ This will be clojure.core or cljs.core depending on the return value of the
107107
function `cider-repl-type'."
108108
(when-let* ((repl (cider-current-repl)))
109109
(with-current-buffer repl
110-
(cider-resolve--get-in (if (eq cider-repl-type 'cljs)
110+
(cider-resolve--get-in (if (or (eq cider-repl-type 'cljs)
111+
(eq major-mode 'clojurescript-mode))
111112
"cljs.core"
112113
"clojure.core")))))
113114

0 commit comments

Comments
 (0)