branch: elpa/cider
commit c62179965e6a506f15f8960fcd72c73e1ec3ffcd
Author: Bozhidar Batsov <bozhi...@batsov.dev>
Commit: Bozhidar Batsov <bozhi...@batsov.dev>
Update test data for Clojure 1.10
---
cider-eval.el | 2 +-
test/cider-error-parsing-tests.el | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cider-eval.el b/cider-eval.el
index 6eb9ab4fc2..df66414f5a 100644
--- a/cider-eval.el
+++ b/cider-eval.el
@@ -698,7 +698,7 @@ See `compilation-error-regexp-alist' for help on their
format.")
(list
(when file
(let ((val (match-string-no-properties file message)))
- (unless (string= val "NO_SOURCE_PATH") val)))
+ (unless (or (string= val "REPL") (string= val "NO_SOURCE_PATH"))
val)))
(when line (string-to-number (match-string-no-properties line message)))
(when col
(let ((val (match-string-no-properties col message)))
diff --git a/test/cider-error-parsing-tests.el
b/test/cider-error-parsing-tests.el
index 7de0746c91..4a887ac47a 100644
--- a/test/cider-error-parsing-tests.el
+++ b/test/cider-error-parsing-tests.el
@@ -45,7 +45,7 @@
(it "extracts correct information from the error message"
;; test-cider-extract-error-info-14
- (let* ((message "CompilerException java.lang.RuntimeException: Unable to
resolve symbol: dummy in this context, compiling:(/some/test/file/core.clj:31)")
+ (let* ((message "Syntax error compiling at (/some/test/file/core.clj:31).
Unable to resolve symbol: dummy in this context.")
(info (cider-extract-error-info cider-compilation-regexp message)))
(expect (file-name info) :to-equal "/some/test/file/core.clj")
(expect (line-num info) :to-equal 31)
@@ -53,7 +53,7 @@
(expect (face info) :to-equal 'cider-error-highlight-face))
;; test-cider-extract-error-info-14-windows
- (let* ((message "CompilerException java.lang.RuntimeException: Unable to
resolve symbol: dummy in this context,
compiling:(c:\\some\\test\\file\\core.clj:31)")
+ (let* ((message "Syntax error compiling at
(c:\\some\\test\\file\\core.clj:31). Unable to resolve symbol: dummy in this
context.")
(info (cider-extract-error-info cider-compilation-regexp message)))
(expect (file-name info) :to-equal "c:\\some\\test\\file\\core.clj")
(expect (line-num info) :to-equal 31)
@@ -61,7 +61,7 @@
(expect (face info) :to-equal 'cider-error-highlight-face))
;; test-cider-extract-error-info-14-no-file
- (let* ((message "CompilerException java.lang.RuntimeException: Unable to
resolve symbol: dummy in this context, compiling:(NO_SOURCE_PATH:31)")
+ (let* ((message "Syntax error compiling at (REPL:31). Unable to resolve
symbol: dummy in this context.")
(info (cider-extract-error-info cider-compilation-regexp message)))
(expect (file-name info) :to-equal nil)
(expect (line-num info) :to-equal 31)
@@ -86,7 +86,7 @@
(expect (face info) :to-equal 'cider-warning-highlight-face))
;; test-cider-extract-error-info-15
- (let* ((message "CompilerException java.lang.RuntimeException: Unable to
resolve symbol: dummy in this context,
compiling:(/some/test/file/core.clj:31:3)")
+ (let* ((message "Syntax error compiling at
(/some/test/file/core.clj:31:3). Unable to resolve symbol: dummy in this
context.")
(info (cider-extract-error-info cider-compilation-regexp message)))
(expect (file-name info) :to-equal "/some/test/file/core.clj")
(expect (line-num info) :to-equal 31)
@@ -94,7 +94,7 @@
(expect (face info) :to-equal 'cider-error-highlight-face))
;; test-cider-extract-error-info-15-no-file
- (let* ((message "CompilerException java.lang.RuntimeException: Unable to
resolve symbol: dummy in this context, compiling:(NO_SOURCE_PATH:31:3)")
+ (let* ((message "Syntax error compiling at (REPL:31:3). Unable to resolve
symbol: dummy in this context")
(info (cider-extract-error-info cider-compilation-regexp message)))
(expect (file-name info) :to-equal nil)
(expect (line-num info) :to-equal 31)
