Skip to content

Commit 78540f5

Browse files
pdbrownbbatsov
authored andcommitted
Enable eldoc-mode in existing clojure buffers
1 parent 6962d02 commit 78540f5

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
* [#2937](https://github.com/clojure-emacs/cider/issues/2937): Green fringe produced for extra line in rich comment block.
1919
* [#2996](https://github.com/clojure-emacs/cider/issues/2937): Fix debugger incorrectly locating `#_` ignored forms.
2020
* Bump the injected `cider-nrepl` to 0.25.6. This should fix a compatibility issue with Java 15 and fetching fresh ClojureDocs data.
21-
* [#3004](https://github.com/clojure-emacs/cider/pull/3004): Use appropriate coding system when unzipping jars
21+
* [#3004](https://github.com/clojure-emacs/cider/pull/3004): Use appropriate coding system when unzipping jars.
22+
* [#2934](https://github.com/clojure-emacs/cider/issues/2934): Enable eldoc-mode in existing clojure buffers.
2223

2324
### Changes
2425

cider-connection.el

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,18 @@ See command `cider-mode'."
261261
(add-hook 'clojure-mode-hook #'cider-mode)
262262
(dolist (buffer (cider-util--clojure-buffers))
263263
(with-current-buffer buffer
264-
(cider-mode +1))))
264+
(cider-mode +1)
265+
;; In global-eldoc-mode, a new file-visiting buffer calls
266+
;; `turn-on-eldoc-mode' which enables eldoc-mode if it's supported in that
267+
;; buffer as determined by `eldoc--supported-p'. Cider's eldoc support
268+
;; allows new buffers in cider-mode to enable eldoc-mode. As of 2021-04,
269+
;; however, clojure-mode itself has no eldoc support, so old clojure
270+
;; buffers opened before cider started aren't necessarily in eldoc-mode.
271+
;; Here, we've enabled cider-mode for this old clojure buffer, and now, if
272+
;; global-eldoc-mode is enabled, try to enable eldoc-mode as if the buffer
273+
;; had just been created with cider-mode.
274+
(when global-eldoc-mode
275+
(turn-on-eldoc-mode)))))
265276

266277
(declare-function cider--debug-mode "cider-debug")
267278
(defun cider-disable-on-existing-clojure-buffers ()

0 commit comments

Comments
 (0)