@@ -562,11 +562,6 @@ It delegates the actual error content to the eval or op handler."
562562 (t (cider-default-err-eval-print-handler))))
563563
564564
565- ; ; The format of the error messages emitted by Clojure's compiler changed in
566- ; ; Clojure 1.10. That's why we're trying to match error messages to both the
567- ; ; old and the new format, by utilizing a combination of two different regular
568- ; ; expressions.
569-
570565(defconst cider-clojure-1.10--location `((or " at ("
571566 (sequence " at "
572567 (minimal-match (one-or-more anything)) ; ; the fully-qualified name of the function that triggered the error
@@ -596,15 +591,6 @@ It delegates the actual error content to the eval or op handler."
596591 (minimal-match (one-or-more anything)))
597592 cider-clojure-1.10--location))
598593
599- (defconst cider-clojure-1.9-error `(sequence
600- (zero-or-more anything)
601- " , compiling:("
602- (group-n 2 (minimal-match (zero-or-more anything)))
603- " :"
604- (group-n 3 (one-or-more digit))
605- (optional " :" (group-n 4 (one-or-more digit)))
606- " )" ))
607-
608594(defconst cider-clojure-warning `(sequence
609595 (minimal-match (zero-or-more anything))
610596 (group-n 1 " warning" )
@@ -619,8 +605,7 @@ It delegates the actual error content to the eval or op handler."
619605; ; which is a subset of these regexes.
620606(defconst cider-clojure-compilation-regexp
621607 (eval
622- `(rx bol (or , cider-clojure-1 .9-error
623- , cider-clojure-warning
608+ `(rx bol (or , cider-clojure-warning
624609 , cider-clojure-1 .10-error
625610 , cider-clojure-unexpected-error ))
626611 t )
@@ -633,8 +618,7 @@ lol in this context, compiling:(/foo/core.clj:10:1)\"
633618
634619(defconst cider-clojure-compilation-error-regexp
635620 (eval
636- `(rx bol (or , cider-clojure-1 .9-error
637- , cider-clojure-1 .10-error
621+ `(rx bol (or , cider-clojure-1 .10-error
638622 , cider-clojure-unexpected-error ))
639623 t )
640624 " Like `cider-clojure-compilation-regexp' ,
0 commit comments