@@ -562,11 +562,6 @@ It delegates the actual error content to the eval or op handler."
562
562
(t (cider-default-err-eval-print-handler))))
563
563
564
564
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
-
570
565
(defconst cider-clojure-1.10--location `((or " at ("
571
566
(sequence " at "
572
567
(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."
596
591
(minimal-match (one-or-more anything)))
597
592
cider-clojure-1.10--location))
598
593
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
-
608
594
(defconst cider-clojure-warning `(sequence
609
595
(minimal-match (zero-or-more anything))
610
596
(group-n 1 " warning" )
@@ -619,8 +605,7 @@ It delegates the actual error content to the eval or op handler."
619
605
; ; which is a subset of these regexes.
620
606
(defconst cider-clojure-compilation-regexp
621
607
(eval
622
- `(rx bol (or , cider-clojure-1 .9-error
623
- , cider-clojure-warning
608
+ `(rx bol (or , cider-clojure-warning
624
609
, cider-clojure-1 .10-error
625
610
, cider-clojure-unexpected-error ))
626
611
t )
@@ -633,8 +618,7 @@ lol in this context, compiling:(/foo/core.clj:10:1)\"
633
618
634
619
(defconst cider-clojure-compilation-error-regexp
635
620
(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
638
622
, cider-clojure-unexpected-error ))
639
623
t )
640
624
" Like `cider-clojure-compilation-regexp' ,
0 commit comments