Merge branch 'master' into add-client-info

Author: ericdallo

.circleci/config.yml

@@ -150,10 +150,11 @@ workflows:
           requires:
             - test-lint
             - test-shellcheck
-      - test-ubuntu-emacs-master:
-          requires:
-            - test-lint
-            - test-shellcheck
+      # TODO: reenable once this issue is fixed https://app.circleci.com/pipelines/github/clojure-emacs/cider/2931/workflows/b7284759-c6d1-44dd-bbfc-e71709e3f62f/jobs/17699
+      # - test-ubuntu-emacs-master:
+      #     requires:
+      #       - test-lint
+      #       - test-shellcheck
       - test-windows-emacs-latest:
           requires:
             - test-lint

.github/workflows/test.yml

@@ -23,7 +23,9 @@ jobs:
       matrix:
         # Test all Emacs versions on Ubuntu.
         os: [ubuntu-latest]
-        emacs_version: ['27.2', '28.2', '29.3', '30.1', 'snapshot']
+        # TODO: reenable snapshot once this is fixed https://app.circleci.com/pipelines/github/clojure-emacs/cider/2931/workflows/b7284759-c6d1-44dd-bbfc-e71709e3f62f/jobs/17699
+        # emacs_version: ['27.2', '28.2', '29.3', '30.1', 'snapshot']
+        emacs_version: ['27.2', '28.2', '29.3', '30.1']
         java_version: ['21']
         include:
           # For other OSes, test only the latest stable Emacs version.

CHANGELOG.md

@@ -14,17 +14,19 @@
 - [#3793](https://github.com/clojure-emacs/cider/issues/3793): **(Breaking)** Remove features that relied on printed exception parsing:
   - `cider-stacktrace-analyze-string` and `cider-stacktrace-analyze-at-point` functions.
   - Automatic stacktrace parsing in log viewer.
-- Bump the injected `cider-nrepl` to [0.54.0](https://github.com/clojure-emacs/cider-nrepl/blob/master/CHANGELOG.md#0540-2025-04-05).
+- Bump the injected `cider-nrepl` to [0.55.0](https://github.com/clojure-emacs/cider-nrepl/blob/master/CHANGELOG.md#0550-2025-04-10).
   - [compliment#122](https://github.com/alexander-yakushev/compliment/pull/122): Completion: sort candidates by priority.
   - Inspector: add dedicated view for Exceptions.
   - Stop vendoring Haystack dependency.
   - Stop vendoring Puget dependency. You can still use `puget` pretty-printer in CIDER, but you need to depend on Puget explicitly. If Puget is not found on the classpath, CIDER will revert to `clojure.pprint/pprint` for pretty-printing.
 - [#3777](https://github.com/clojure-emacs/cider/issues/3777): Inspector no longer displays parsed Javadoc for Java classes and members.
 - [#3790](https://github.com/clojure-emacs/cider/issues/3790): Stacktrace: show messages and data for all exception causes by default.
+- [#3807](https://github.com/clojure-emacs/cider/issues/3807): Stacktrace: make exception data individually inspectable.
 - [#3789](https://github.com/clojure-emacs/cider/issues/3789): Refactor and simplify exception handling.
 - [#3789](https://github.com/clojure-emacs/cider/issues/3796): Completion: disable client-side sorting (defer to backend-provided candidate order).
 - [#3797](https://github.com/clojure-emacs/cider/issues/3797): Completion: enable `cider-completion-style` by default (this enables richer completion suggestions where candidates don't have to strictly match the prefix).
 - [#3803](https://github.com/clojure-emacs/cider/pull/3803): Enable dynamic indentation for `clojure-ts-mode`.
+- [#3805](https://github.com/clojure-emacs/cider/pull/3805): Profiler: update to latest profiling middleware.
 - [#3806](https://github.com/clojure-emacs/cider/pull/3806): Add client info to `clone` op request.
 
 ### Bugs fixed

cider-eval.el

@@ -295,15 +295,21 @@ When clojure.stracktrace is not present."
    (cider-nrepl-sync-request:eval
     "(println (ex-data *e))")))
 
-(defun cider--render-stacktrace-causes (causes &optional error-types is-compilation)
+(defun cider--render-stacktrace-causes (causes &optional error-types
+                                               is-compilation repl)
   "If CAUSES is non-nil, render its contents into a new error buffer.
 Optional argument ERROR-TYPES contains a list which should determine the
 op/situation that originated this error.
 If IS-COMPILATION is true, render the stacktrace into the error buffer but
-don't bring it forward."
+don't bring it forward.
+REPL connection can be provided to set it as the connection for the created
+*cider-error* buffer."
   (when causes
-    (let ((error-buffer (cider-new-error-buffer #'cider-stacktrace-mode
-                                                error-types is-compilation)))
+    (let* ((repl (or repl (cider-current-repl)))
+           (error-buffer (cider-new-error-buffer #'cider-stacktrace-mode
+                                                 error-types is-compilation)))
+      (with-current-buffer error-buffer
+        (setq cider--ancillary-buffer-repl repl))
       (cider-stacktrace-render error-buffer causes error-types))))
 
 (defconst cider-clojure-compilation-error-phases-default-value
@@ -362,7 +368,8 @@ For others, pop up *cider-error* buffer."
         (nrepl-notify msg type))))
   ;; Render stacktrace in *cider-error* buffer if it is a runtime error.
   (cider--render-stacktrace-causes
-   causes nil (member ex-phase (cider-clojure-compilation-error-phases)))
+   causes nil (member ex-phase (cider-clojure-compilation-error-phases))
+   (with-current-buffer source-buffer (cider-current-repl)))
   ;; If the error is a compilation error (which we normally don't show
   ;; *cider-error* buffer for), or the error buffer is disabled, compensate for
   ;; the lack of info with a overlay error. Verify that the provided buffer is

cider-inspector.el

@@ -252,11 +252,17 @@ See `cider-sync-request:inspect-push' and `cider-inspector--render-value'"
       (push (point) cider-inspector-location-stack)
       (cider-inspector--render-value result :next-inspectable))))
 
-(defun cider-inspector-inspect-last-exception (index)
-  "Inspects the exception in the cause stack identified by INDEX."
+(defun cider-inspector-inspect-last-exception (index &optional ex-data)
+  "Inspects the exception in the cause stack identified by INDEX.
+If EX-DATA is true, inspect ex-data of the exception instead."
   (interactive)
   (cl-assert (numberp index))
-  (let ((result (cider-sync-request:inspect-last-exception index)))
+  (let ((result (cider-nrepl-send-sync-request
+                 `("op" "inspect-last-exception"
+                   "index" ,index
+                   ,@(when ex-data
+                       `("ex-data" "true")))
+                 (cider-current-repl))))
     (when (nrepl-dict-get result "value")
       (setq cider-inspector-location-stack nil)
       (cider-inspector--render-value result :next-inspectable))))
@@ -423,14 +429,6 @@ current-namespace."
   (cider-nrepl-send-sync-request `("op" "inspect-previous-sibling")
                                  (cider-current-repl)))
 
-;;;###autoload
-(defun cider-sync-request:inspect-last-exception (index)
-  "Inspects the exception in the cause stack identified by INDEX."
-  (cl-assert (numberp index))
-  (cider-nrepl-send-sync-request `("op" "inspect-last-exception"
-                                   "index" ,index)
-                                 (cider-current-repl)))
-
 (defun cider-sync-request:inspect-next-sibling ()
   "Inspect the next sibling value within a sequential parent."
   (cider-nrepl-send-sync-request `("op" "inspect-next-sibling")

cider-mode.el

@@ -673,7 +673,7 @@ The result depends on the buffer CIDER connection type."
 (defface cider-traced-face
   '((((type graphic)) :box (:color "cyan" :line-width -1))
     (t :underline t :background "#066"))
-  "Face used to mark code being traced."
+  "Face used to mark functions being traced or profiled."
   :group 'cider
   :package-version '(cider . "0.11.0"))
 
@@ -805,11 +805,11 @@ with the given LIMIT."
                           (push sym instrumented))
                          (`"\"light-form\""
                           (push sym enlightened)))
-                       ;; The ::traced keywords can be inlined by MrAnderson, so
-                       ;; we catch that case too.
                        ;; FIXME: This matches values too, not just keys.
-                       (when (seq-find (lambda (k) (and (stringp k)
-                                                        (string-match (rx "orchard.trace/traced" eos) k)))
+                       (when (seq-find (lambda (k)
+                                         (and (stringp k)
+                                              (or (string= "orchard.trace/traced" k)
+                                                  (string= "orchard.profile/profiled" k))))
                                        meta)
                          (push sym traced))
                        (when (and do-deprecated (nrepl-dict-get meta "deprecated"))

cider-profile.el

@@ -28,25 +28,18 @@
 (require 'cider-client)
 (require 'cider-popup)
 (require 'cider-eval)
-
-(defconst cider-profile-buffer "*cider-profile*")
+(require 'cider-inspector)
 
 (defvar cider-profile-map
   (let ((map (define-prefix-command 'cider-profile-map)))
     (define-key map (kbd "t") #'cider-profile-toggle)
     (define-key map (kbd "C-t") #'cider-profile-toggle)
     (define-key map (kbd "c") #'cider-profile-clear)
     (define-key map (kbd "C-c") #'cider-profile-clear)
-    (define-key map (kbd "S") #'cider-profile-summary)
-    (define-key map (kbd "C-S") #'cider-profile-summary)
-    (define-key map (kbd "s") #'cider-profile-var-summary)
-    (define-key map (kbd "C-s") #'cider-profile-var-summary)
+    (define-key map (kbd "s") #'cider-profile-summary)
+    (define-key map (kbd "C-s") #'cider-profile-summary)
     (define-key map (kbd "n") #'cider-profile-ns-toggle)
     (define-key map (kbd "C-n") #'cider-profile-ns-toggle)
-    (define-key map (kbd "v") #'cider-profile-var-profiled-p)
-    (define-key map (kbd "C-v") #'cider-profile-var-profiled-p)
-    (define-key map (kbd "+") #'cider-profile-samples)
-    (define-key map (kbd "C-+") #'cider-profile-samples)
     map)
   "CIDER profiler keymap.")
 
@@ -55,9 +48,6 @@
     ["Toggle var profiling" cider-profile-toggle]
     ["Toggle namespace profiling" cider-profile-ns-toggle]
     "--"
-    ["Display var profiling status" cider-profile-var-profiled-p]
-    ["Display max sample count" cider-profile-samples]
-    ["Display var summary" cider-profile-var-summary]
     ["Display summary" cider-profile-summary]
     ["Clear data" cider-profile-clear])
   "CIDER profiling submenu.")
@@ -69,66 +59,20 @@ Optional argument BUFFER defaults to current buffer."
   (nrepl-make-response-handler
    (or buffer (current-buffer)) handler nil nil nil))
 
-;;;###autoload
-(defun cider-profile-samples (&optional query)
-  "Displays current max-sample-count.
-If optional QUERY is specified, set max-sample-count and display new value."
-  (interactive "P")
-  (cider-ensure-op-supported "set-max-samples")
-  (cider-ensure-op-supported "get-max-samples")
-  (if (not (null query))
-      (cider-nrepl-send-request
-       (let ((max-samples (if (numberp query) query '())))
-         (message "query: %s" max-samples)
-         `("op" "set-max-samples" "max-samples" ,max-samples))
-       (cider-profile--make-response-handler
-        (lambda (_buffer value)
-          (let ((value (if (zerop (length value)) "unlimited" value)))
-            (message "max-sample-count is now %s" value)))))
-    (cider-nrepl-send-request
-     '("op" "get-max-samples")
-     (cider-profile--make-response-handler
-      (lambda (_buffer value)
-        (let ((value (if (zerop (length value)) "unlimited" value)))
-          (message "max-sample-count is now %s" value))))))
-  query)
-
-;;;###autoload
-(defun cider-profile-var-profiled-p (query)
-  "Displays the profiling status of var under point.
-Prompts for var if none under point or QUERY is present."
-  (interactive "P")
-  (cider-ensure-op-supported "is-var-profiled")
-  (cider-read-symbol-name
-   "Report profiling status for var: "
-   (lambda (sym)
-     (let ((ns (cider-current-ns)))
-       (cider-nrepl-send-request
-        `("op" "is-var-profiled"
-          "ns" ,ns
-          "sym" ,sym)
-        (cider-profile--make-response-handler
-         (lambda (_buffer value)
-           (pcase value
-             ("profiled" (message "Profiling is currently enabled for %s/%s" ns sym))
-             ("unprofiled" (message "Profiling  is currently disabled for %s/%s" ns sym))
-             ("unbound" (message "%s/%s is unbound" ns sym)))))))))
-  query)
-
 ;;;###autoload
 (defun cider-profile-ns-toggle (&optional query)
   "Toggle profiling for the ns associated with optional QUERY.
 
 If optional argument QUERY is non-nil, prompt for ns.  Otherwise use
 current ns."
   (interactive "P")
-  (cider-ensure-op-supported "toggle-profile-ns")
+  (cider-ensure-op-supported "cider/profile-toggle-ns")
   (let ((ns (if query
                 (completing-read "Toggle profiling for ns: "
                                  (cider-sync-request:ns-list))
               (cider-current-ns))))
     (cider-nrepl-send-request
-     `("op" "toggle-profile-ns"
+     `("op" "cider/profile-toggle-ns"
        "ns" ,ns)
      (cider-profile--make-response-handler
       (lambda (_buffer value)
@@ -143,69 +87,42 @@ current ns."
 Defaults to the symbol at point.
 With prefix arg or no symbol at point, prompts for a var."
   (interactive "P")
-  (cider-ensure-op-supported "toggle-profile")
+  (cider-ensure-op-supported "cider/profile-toggle-var")
   (cider-read-symbol-name
    "Toggle profiling for var: "
    (lambda (sym)
      (let ((ns (cider-current-ns)))
        (cider-nrepl-send-request
-        `("op" "toggle-profile"
+        `("op" "cider/profile-toggle-var"
           "ns" ,ns
           "sym" ,sym)
         (cider-profile--make-response-handler
          (lambda (_buffer value)
            (pcase value
              ("profiled" (message "Profiling enabled for %s/%s" ns sym))
-             ("unprofiled" (message "Profiling disabled for %s/%s" ns sym))
-             ("unbound" (message "%s/%s is unbound" ns sym)))))))))
+             ("unprofiled" (message "Profiling disabled for %s/%s" ns sym)))))))))
   query)
 
-(defun cider-profile-display-stats (stats-response)
-  "Displays the STATS-RESPONSE on `cider-profile-buffer`."
-  (let ((table (nrepl-dict-get stats-response "err")))
-    (if cider-profile-buffer
-        (let ((buffer (cider-make-popup-buffer cider-profile-buffer)))
-          (with-current-buffer buffer
-            (let ((inhibit-read-only t)) (insert table)))
-          (display-buffer buffer)
-          (let ((window (get-buffer-window buffer)))
-            (set-window-point window 0)
-            (select-window window)
-            (fit-window-to-buffer window)))
-      (cider-emit-interactive-eval-err-output table))))
+(defun cider-profile--send-to-inspector (summary-response)
+  "Displays SUMMARY-RESPONSE using the inspector."
+  (let ((value (nrepl-dict-get summary-response "value")))
+    (cider-inspector--render-value value)))
 
 ;;;###autoload
 (defun cider-profile-summary ()
   "Display a summary of currently collected profile data."
   (interactive)
-  (cider-ensure-op-supported "profile-summary")
-  (cider-profile-display-stats
-   (cider-nrepl-send-sync-request '("op" "profile-summary"))))
-
-;;;###autoload
-(defun cider-profile-var-summary (query)
-  "Display profile data for var under point QUERY.
-Defaults to the symbol at point.  With prefix arg or no symbol at point,
-prompts for a var."
-  (interactive "P")
-  (cider-ensure-op-supported "profile-var-summary")
-  (cider-read-symbol-name
-   "Profile-summary for var: "
-   (lambda (sym)
-     (cider-profile-display-stats
-      (cider-nrepl-send-sync-request
-       `("op" "profile-var-summary"
-         "ns" ,(cider-current-ns)
-         "sym" ,sym)))))
-  query)
+  (cider-ensure-op-supported "cider/profile-summary")
+  (cider-inspector--render-value
+   (cider-nrepl-send-sync-request '("op" "cider/profile-summary"))))
 
 ;;;###autoload
 (defun cider-profile-clear ()
   "Clear any collected profile data."
   (interactive)
-  (cider-ensure-op-supported "clear-profile")
+  (cider-ensure-op-supported "cider/profile-clear")
   (cider-nrepl-send-request
-   '("op" "clear-profile")
+   '("op" "cider/profile-clear")
    (cider-profile--make-response-handler
     (lambda (_buffer value)
       (when (equal value "cleared")

cider-selector.el

@@ -34,7 +34,6 @@
 (require 'cider-client)
 (require 'cider-eval)
 (require 'cider-scratch)
-(require 'cider-profile)
 
 (defconst cider-selector-help-buffer "*CIDER Selector Help*"
   "The name of the selector's help buffer.")
@@ -162,10 +161,6 @@ visited cider-repl-mode buffer."
   "*cider-error* buffer."
   cider-error-buffer)
 
-(def-cider-selector-method ?p
-  "*cider-profile* buffer."
-  cider-profile-buffer)
-
 (def-cider-selector-method ?d
   "*cider-doc* buffer."
   cider-doc-buffer)