fixup

Author: alexander-yakushev

cider-eval.el

@@ -245,17 +245,18 @@ currently selected buffer."
               '(t always only-in-repl)
             '(t always except-in-repl)))))
 
-(defun cider-new-error-buffer (&optional mode error-types)
+(defun cider-new-error-buffer (&optional mode error-types dont-show)
   "Return an empty error buffer using MODE.
 
 When deciding whether to display the buffer, takes into account not only
 the value of `cider-show-error-buffer' and the currently selected buffer
 but also the ERROR-TYPES of the error, which is checked against the
-`cider-stacktrace-suppressed-errors' set.
+`cider-stacktrace-suppressed-errors' set, and the value of DONT-SHOW.
 
 When deciding whether to select the buffer, takes into account the value of
 `cider-auto-select-error-buffer'."
   (if (and (cider--show-error-buffer-p)
+           (not dont-show)
            (not (cider-stacktrace-some-suppressed-errors-p error-types)))
       (cider-popup-buffer cider-error-buffer cider-auto-select-error-buffer mode 'ancillary)
     (cider-make-popup-buffer cider-error-buffer mode 'ancillary)))
@@ -294,13 +295,16 @@ When clojure.stracktrace is not present."
    (cider-nrepl-sync-request:eval
     "(println (ex-data *e))")))
 
-(defun cider--render-stacktrace-causes (causes &optional error-types)
+(defun cider--render-stacktrace-causes (causes &optional error-types is-compilation)
   "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."
+op/situation that originated this error.
+If IS-COMPILATION is true, render the stacktrace into the error buffer but
+don't bring it forward."
   (when causes
-    (let ((error-buffer (cider-new-error-buffer #'cider-stacktrace-mode error-types)))
-      (cider-stacktrace-render error-buffer (reverse causes) error-types))))
+    (let ((error-buffer (cider-new-error-buffer #'cider-stacktrace-mode
+                                                error-types is-compilation)))
+      (cider-stacktrace-render error-buffer causes error-types))))
 
 (defconst cider-clojure-compilation-error-phases-default-value
   '("read-source"
@@ -336,8 +340,8 @@ https://clojure.org/reference/repl_and_main#_at_repl"
       cider-clojure-compilation-error-phases-default-value
     cider-clojure-compilation-error-phases))
 
-(defun cider--display-error-as-overlay (buffer err)
-  "Display ERR as a temporary overlay in BUFFER."
+(defun cider--display-error-unobtrusively (buffer err)
+  "Display ERR as a minibuffer message and/or as a temporary overlay in BUFFER."
   (let ((cider-result-use-clojure-font-lock nil)
         (trimmed-err (funcall cider-inline-error-message-function err)))
     (with-current-buffer buffer
@@ -357,8 +361,8 @@ For others, pop up *cider-error* buffer."
       (when (member "notification" status)
         (nrepl-notify msg type))))
   ;; Render stacktrace in *cider-error* buffer if it is a runtime error.
-  (unless (member ex-phase (cider-clojure-compilation-error-phases))
-    (cider--render-stacktrace-causes causes))
+  (cider--render-stacktrace-causes
+   causes nil (member ex-phase (cider-clojure-compilation-error-phases)))
   ;; 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.

cider.el

@@ -573,7 +573,7 @@ the artifact.")
 
 Used when `cider-jack-in-auto-inject-clojure' is set to `latest'.")
 
-(defconst cider-required-middleware-version "0.52.1"
+(defconst cider-required-middleware-version "0.53.0-alpha1"
   "The CIDER nREPL version that's known to work properly with CIDER.")
 
 (defcustom cider-injected-middleware-version cider-required-middleware-version

test/cider-error-parsing-tests.el

@@ -139,65 +139,6 @@
                        (match-string 2 clojure-1.10-compiler-error))
                 :to-equal "src/haystack/parser.cljc")))))
 
-(describe "cider-clojure-runtime-error-regexp"
-  (it "Recognizes a clojure-1.10 runtime error message"
-
-    ;; Something like "(ArithmeticException)" will be absent for Exception and RuntimeException in particular
-    (let ((specimen "Execution error at foo/foo (src/haystack/parser.cljc:4)."))
-      (expect specimen :to-match cider-clojure-runtime-error-regexp)
-      (expect (progn
-                (string-match cider-clojure-runtime-error-regexp specimen)
-                (match-string 2 specimen))
-              :to-equal "src/haystack/parser.cljc"))
-
-    (let ((specimen "Execution error (ArithmeticException) at foo/foo (src/haystack/parser.cljc:4)."))
-      (expect specimen :to-match cider-clojure-runtime-error-regexp)
-      (expect (progn
-                (string-match cider-clojure-runtime-error-regexp specimen)
-                (match-string 2 specimen))
-              :to-equal "src/haystack/parser.cljc"))
-
-    ;; without exception class cause-type
-    (let ((specimen "Execution error at (src/haystack/parser.cljc:4)."))
-      (expect specimen :to-match cider-clojure-runtime-error-regexp)
-      (expect (progn
-                (string-match cider-clojure-runtime-error-regexp specimen)
-                (match-string 2 specimen))
-              :to-equal "src/haystack/parser.cljc"))
-
-    ;; without foo/foo symbol
-    (let ((specimen "Execution error (ArithmeticException) at (src/haystack/parser.cljc:4)."))
-      (expect specimen :to-match cider-clojure-runtime-error-regexp)
-      (expect (progn
-                (string-match cider-clojure-runtime-error-regexp specimen)
-                (match-string 2 specimen))
-              :to-equal "src/haystack/parser.cljc")))
-
-  (it "Recognizes a clojure-1.10 runtime spec validation error message"
-    (let ((specimen "Execution error - invalid arguments to foo/bar at (src/haystack/parser.cljc:4)."))
-      (expect specimen :to-match cider-clojure-runtime-error-regexp)
-      (expect (progn
-                (string-match cider-clojure-runtime-error-regexp specimen)
-                (match-string 2 specimen))
-              :to-equal "src/haystack/parser.cljc")))
-
-  ;; Java source locations may be negative (#3687)
-  (it "Recognizes an error thrown from a java source file"
-    (let ((specimen "Execution error (FileNotFoundException) at java.io.FileInputStream/open0 (FileInputStream.java:-2)."))
-      (expect specimen :to-match cider-clojure-runtime-error-regexp)
-      (expect (progn
-                (string-match cider-clojure-runtime-error-regexp specimen)
-                (match-string 2 specimen))
-              :to-equal "FileInputStream.java")))
-
-  (it "Recognizes errors thrown during the result printing phase"
-    (let ((specimen "Error printing return value (ClassCastException) at clojure.core/file-seq$fn (core.clj:4997)."))
-      (expect specimen :to-match cider-clojure-runtime-error-regexp)
-      (expect (progn
-                (string-match cider-clojure-runtime-error-regexp specimen)
-                (match-string 2 specimen))
-              :to-equal "core.clj"))))
-
 (describe "cider-module-info-regexp"
   (it "Matches module info provided by Java"
     (expect " (java.lang.Long is in module java.base of loader 'bootstrap'; clojure.lang.IObj is in unnamed module of loader 'app')"