Fix clojure.core function highlighting on ClojureScript

Part of #3385
clojure-emacs · Jul 30, 2023 · 53f9ffb · 53f9ffb
1 parent cc31f5b
commit 53f9ffb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - [#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.
 - [#3362](https://github.com/clojure-emacs/cider/issues/3362): Fix `sesman-restart` regression issue.
 - [#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`.
+- [#3385](https://github.com/clojure-emacs/cider/issues/3385): Fix `clojure.core` function highlighting on ClojureScript.
 
 ### Changes
 

diff --git a/cider-resolve.el b/cider-resolve.el
@@ -107,7 +107,8 @@ This will be clojure.core or cljs.core depending on the return value of the
 function `cider-repl-type'."
   (when-let* ((repl (cider-current-repl)))
     (with-current-buffer repl
-      (cider-resolve--get-in (if (eq cider-repl-type 'cljs)
+      (cider-resolve--get-in (if (or (eq cider-repl-type 'cljs)
+                                     (eq major-mode 'clojurescript-mode))
                                  "cljs.core"
                                "clojure.core")))))