Skip to content

Commit c621799

Browse files
committed
Update test data for Clojure 1.10
1 parent 160995b commit c621799

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

cider-eval.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ See `compilation-error-regexp-alist' for help on their format.")
698698
(list
699699
(when file
700700
(let ((val (match-string-no-properties file message)))
701-
(unless (string= val "NO_SOURCE_PATH") val)))
701+
(unless (or (string= val "REPL") (string= val "NO_SOURCE_PATH")) val)))
702702
(when line (string-to-number (match-string-no-properties line message)))
703703
(when col
704704
(let ((val (match-string-no-properties col message)))

test/cider-error-parsing-tests.el

+5-5
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,23 @@
4545
(it "extracts correct information from the error message"
4646

4747
;; test-cider-extract-error-info-14
48-
(let* ((message "CompilerException java.lang.RuntimeException: Unable to resolve symbol: dummy in this context, compiling:(/some/test/file/core.clj:31)")
48+
(let* ((message "Syntax error compiling at (/some/test/file/core.clj:31). Unable to resolve symbol: dummy in this context.")
4949
(info (cider-extract-error-info cider-compilation-regexp message)))
5050
(expect (file-name info) :to-equal "/some/test/file/core.clj")
5151
(expect (line-num info) :to-equal 31)
5252
(expect (col-num info) :to-equal nil)
5353
(expect (face info) :to-equal 'cider-error-highlight-face))
5454

5555
;; test-cider-extract-error-info-14-windows
56-
(let* ((message "CompilerException java.lang.RuntimeException: Unable to resolve symbol: dummy in this context, compiling:(c:\\some\\test\\file\\core.clj:31)")
56+
(let* ((message "Syntax error compiling at (c:\\some\\test\\file\\core.clj:31). Unable to resolve symbol: dummy in this context.")
5757
(info (cider-extract-error-info cider-compilation-regexp message)))
5858
(expect (file-name info) :to-equal "c:\\some\\test\\file\\core.clj")
5959
(expect (line-num info) :to-equal 31)
6060
(expect (col-num info) :to-equal nil)
6161
(expect (face info) :to-equal 'cider-error-highlight-face))
6262

6363
;; test-cider-extract-error-info-14-no-file
64-
(let* ((message "CompilerException java.lang.RuntimeException: Unable to resolve symbol: dummy in this context, compiling:(NO_SOURCE_PATH:31)")
64+
(let* ((message "Syntax error compiling at (REPL:31). Unable to resolve symbol: dummy in this context.")
6565
(info (cider-extract-error-info cider-compilation-regexp message)))
6666
(expect (file-name info) :to-equal nil)
6767
(expect (line-num info) :to-equal 31)
@@ -86,15 +86,15 @@
8686
(expect (face info) :to-equal 'cider-warning-highlight-face))
8787

8888
;; test-cider-extract-error-info-15
89-
(let* ((message "CompilerException java.lang.RuntimeException: Unable to resolve symbol: dummy in this context, compiling:(/some/test/file/core.clj:31:3)")
89+
(let* ((message "Syntax error compiling at (/some/test/file/core.clj:31:3). Unable to resolve symbol: dummy in this context.")
9090
(info (cider-extract-error-info cider-compilation-regexp message)))
9191
(expect (file-name info) :to-equal "/some/test/file/core.clj")
9292
(expect (line-num info) :to-equal 31)
9393
(expect (col-num info) :to-equal 3)
9494
(expect (face info) :to-equal 'cider-error-highlight-face))
9595

9696
;; test-cider-extract-error-info-15-no-file
97-
(let* ((message "CompilerException java.lang.RuntimeException: Unable to resolve symbol: dummy in this context, compiling:(NO_SOURCE_PATH:31:3)")
97+
(let* ((message "Syntax error compiling at (REPL:31:3). Unable to resolve symbol: dummy in this context")
9898
(info (cider-extract-error-info cider-compilation-regexp message)))
9999
(expect (file-name info) :to-equal nil)
100100
(expect (line-num info) :to-equal 31)

0 commit comments

Comments
 (0)