Merge pull request #1384 from juergenhoetzel/master

Handle Windows  filenames in cider-compilation-regex

Author: bbatsov

CHANGELOG.md

@@ -50,6 +50,7 @@
 
 ### Bugs fixed
 
+* [#1384](https://github.com/clojure-emacs/cider/pull/1384): Match windows file names in `cider-compilation-regexp`.
 * [#1252](https://github.com/clojure-emacs/cider/issues/1252) `cider-repl-clear-buffer` stops working in certain circumstances.
 * [#1164](https://github.com/clojure-emacs/cider/pull/1164): Fix an error in `cider-browse-ns--doc-at-point`.
 * [#1189](https://github.com/clojure-emacs/cider/issues/1189): Don't show result from automatic ns form evaluation.

cider-interaction.el

@@ -811,7 +811,7 @@ It delegates the actual error content to the eval or op handler."
     (cider-default-err-eval-handler)))
 
 (defvar cider-compilation-regexp
-  '("\\(?:.*\\(warning, \\)\\|.*?\\(, compiling\\):(\\)\\([^:]*\\):\\([[:digit:]]+\\)\\(?::\\([[:digit:]]+\\)\\)?\\(\\(?: - \\(.*\\)\\)\\|)\\)" 3 4 5 (1))
+  '("\\(?:.*\\(warning, \\)\\|.*?\\(, compiling\\):(\\)\\(.*?\\):\\([[:digit:]]+\\)\\(?::\\([[:digit:]]+\\)\\)?\\(\\(?: - \\(.*\\)\\)\\|)\\)" 3 4 5 (1))
   "Specifications for matching errors and warnings in Clojure stacktraces.
 See `compilation-error-regexp-alist' for help on their format.")
 

test/cider-error-parsing-tests.el

@@ -8,6 +8,14 @@
       (should (equal (nth 2 info) nil))
       (should (equal (nth 3 info) 'cider-error-highlight-face)))))
 
+(ert-deftest 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 ((info (cider-extract-error-info cider-compilation-regexp message)))
+      (should (string= (nth 0 info) "c:\\some\\test\\file\\core.clj"))
+      (should (= (nth 1 info) 31))
+      (should (equal (nth 2 info) nil))
+      (should (equal (nth 3 info) 'cider-error-highlight-face)))))
+
 (ert-deftest 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 ((info (cider-extract-error-info cider-compilation-regexp message)))