From 24a8789ebdb9da66db78e49cc18f108a98e23374 Mon Sep 17 00:00:00 2001 From: Arne Brasseur Date: Tue, 7 Sep 2021 15:26:37 +0200 Subject: [PATCH 1/3] Fix info/lookup fallback: response has an extra level When doing a var-info lookup we potentially try three different strategies: info, lookup, and eval. The second currently always fails, because the "info" dict is not at the top level in the response message, but nested under an "info" key. --- cider-client.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cider-client.el b/cider-client.el index 528b0a28b..964ad6d08 100644 --- a/cider-client.el +++ b/cider-client.el @@ -637,7 +637,7 @@ CONTEXT represents a completion context for compliment." (cider-nrepl-send-sync-request (cider-current-repl))))) (if (member "lookup-error" (nrepl-dict-get var-info "status")) nil - var-info))) + (nrepl-dict-get var-info "info")))) (defun cider-sync-request:eldoc (symbol &optional class member) "Send \"eldoc\" op with parameters SYMBOL or CLASS and MEMBER." From 435b277ed6fd15f332ac22d866db31fc681d8c02 Mon Sep 17 00:00:00 2001 From: Arne Brasseur Date: Wed, 8 Sep 2021 11:28:35 +0200 Subject: [PATCH 2/3] Fix linting warnings --- cider-connection.el | 2 +- cider-debug.el | 2 +- cider-doc.el | 10 +++++----- cider-popup.el | 2 +- cider-scratch.el | 2 +- cider-stacktrace.el | 14 +++++++------- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cider-connection.el b/cider-connection.el index 5e6cc50db..53eb0ab37 100644 --- a/cider-connection.el +++ b/cider-connection.el @@ -699,7 +699,7 @@ Session name can be customized with `cider-session-name-template'." ;;; REPL Buffer Init (defvar-local cider-cljs-repl-type nil - "The type of the ClojureScript runtime (Browser, Node, Figwheel, etc.)") + "The type of the ClojureScript runtime (Browser, Node, Figwheel, etc.).") (defvar-local cider-repl-type nil "The type of this REPL buffer, usually either clj or cljs.") diff --git a/cider-debug.el b/cider-debug.el index 78a8a0a9c..7a81cf1d5 100644 --- a/cider-debug.el +++ b/cider-debug.el @@ -407,7 +407,7 @@ In order to work properly, this mode must be activated by (cider--debug-mode-redisplay)) (easy-menu-define cider-debug-mode-menu cider--debug-mode-map - "Menu for CIDER debug mode" + "Menu for CIDER debug mode." `("CIDER Debugger" ["Next step" (cider-debug-mode-send-reply ":next") :keys "n"] ["Continue" (cider-debug-mode-send-reply ":continue") :keys "c"] diff --git a/cider-doc.el b/cider-doc.el index 686f3954e..76f13db61 100644 --- a/cider-doc.el +++ b/cider-doc.el @@ -120,25 +120,25 @@ (defface cider-docview-emphasis-face '((t (:inherit default :underline t))) - "Face for emphasized text" + "Face for emphasized text." :group 'cider-docview-mode :package-version '(cider . "0.7.0")) (defface cider-docview-strong-face '((t (:inherit default :underline t :weight bold))) - "Face for strongly emphasized text" + "Face for strongly emphasized text." :group 'cider-docview-mode :package-version '(cider . "0.7.0")) (defface cider-docview-literal-face '((t (:inherit font-lock-string-face))) - "Face for literal text" + "Face for literal text." :group 'cider-docview-mode :package-version '(cider . "0.7.0")) (defface cider-docview-table-border-face '((t (:inherit shadow))) - "Face for table borders" + "Face for table borders." :group 'cider-docview-mode :package-version '(cider . "0.7.0")) @@ -188,7 +188,7 @@ (defvar cider-docview-line) (define-derived-mode cider-docview-mode help-mode "Doc" - "Major mode for displaying CIDER documentation + "Major mode for displaying CIDER documentation. \\{cider-docview-mode-map}" (setq buffer-read-only t) diff --git a/cider-popup.el b/cider-popup.el index 9df3680a0..2dfe9197d 100644 --- a/cider-popup.el +++ b/cider-popup.el @@ -27,7 +27,7 @@ (require 'cider-compat) (define-minor-mode cider-popup-buffer-mode - "Mode for CIDER popup buffers" + "Mode for CIDER popup buffers." nil (" cider-tmp") '(("q" . cider-popup-buffer-quit-function))) diff --git a/cider-scratch.el b/cider-scratch.el index 714e40be0..43a07ea70 100644 --- a/cider-scratch.el +++ b/cider-scratch.el @@ -71,7 +71,7 @@ (define-derived-mode cider-clojure-interaction-mode clojure-mode "Clojure Interaction" "Major mode for typing and evaluating Clojure forms. -Like clojure-mode except that \\[cider-eval-print-last-sexp] evals the Lisp expression +Like `clojure-mode' except that \\[cider-eval-print-last-sexp] evals the Lisp expression before point, and prints its value into the buffer, advancing point. \\{cider-clojure-interaction-mode-map}" diff --git a/cider-stacktrace.el b/cider-stacktrace.el index 31ad5f379..3f759d085 100644 --- a/cider-stacktrace.el +++ b/cider-stacktrace.el @@ -86,43 +86,43 @@ The error types are represented as strings." (defface cider-stacktrace-error-class-face '((t (:inherit font-lock-warning-face))) - "Face for exception class names" + "Face for exception class names." :group 'cider-stacktrace :package-version '(cider . "0.6.0")) (defface cider-stacktrace-error-message-face '((t (:inherit font-lock-doc-face))) - "Face for exception messages" + "Face for exception messages." :group 'cider-stacktrace :package-version '(cider . "0.7.0")) (defface cider-stacktrace-filter-active-face '((t (:inherit button :underline t :weight normal))) - "Face for filter buttons representing frames currently visible" + "Face for filter buttons representing frames currently visible." :group 'cider-stacktrace :package-version '(cider . "0.6.0")) (defface cider-stacktrace-filter-inactive-face '((t (:inherit button :underline nil :weight normal))) - "Face for filter buttons representing frames currently filtered out" + "Face for filter buttons representing frames currently filtered out." :group 'cider-stacktrace :package-version '(cider . "0.6.0")) (defface cider-stacktrace-face '((t (:inherit default))) - "Face for stack frame text" + "Face for stack frame text." :group 'cider-stacktrace :package-version '(cider . "0.6.0")) (defface cider-stacktrace-ns-face '((t (:inherit font-lock-comment-face))) - "Face for stack frame namespace name" + "Face for stack frame namespace name." :group 'cider-stacktrace :package-version '(cider . "0.6.0")) (defface cider-stacktrace-fn-face '((t (:inherit default :weight bold))) - "Face for stack frame function name" + "Face for stack frame function name." :group 'cider-stacktrace :package-version '(cider . "0.6.0")) From c0d758b9253267f912ee907cdd2e337874dd2869 Mon Sep 17 00:00:00 2001 From: Arne Brasseur Date: Wed, 8 Sep 2021 11:34:07 +0200 Subject: [PATCH 3/3] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25822537e..b51ffa492 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ * [#3039](https://github.com/clojure-emacs/cider/pull/3039): Allow starting the sideloader for the tooling session. * [#3041](https://github.com/clojure-emacs/cider/pull/3041): Sideloader: handle binary files, support multiple directories * [#3044](https://github.com/clojure-emacs/cider/pull/3044): Dynamically upgrade nREPL connection +* [#3047](https://github.com/clojure-emacs/cider/pull/3047): Fix info/lookup fallback: response has an extra level ## 1.1.1 (2021-05-24)