procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make ant regexp in compilation-error-regexp-alist-alist more lax

Browse source 
* lisp/progmodes/compile.el: Make ant regexp accept filenames that may
occur on Cygwin (like c:/test) and optional additional severity level
after task name.
* etc/compilation.txt: Add sample.
This commit is contained in:
Filipp Gunbin 2019-10-31 21:39:01 +03:00
parent 8758c96dc7
commit 0bffb3e69d
3 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
etc/compilation.txt
View file

@ -49,10 +49,11 @@ The regexps found on http://ant.apache.org/faq.html, and since
integrated in both Emacsen, were hairy. The extra two numbers for
jikes are the ending line and ending column.
[javac] /src/DataBaseTestCase.java:27: unreported exception ...
[javac] /src/DataBaseTestCase.java:49: warning: finally clause cannot complete normally
[jikes] foo.java:3:5:7:9: blah blah
[javadoc] c:\MyProject\Polynomial.java:560: error: unknown tag: math
[javac] /src/DataBaseTestCase.java:27: unreported exception ...
[javac] /src/DataBaseTestCase.java:49: warning: finally clause cannot complete normally
[jikes] foo.java:3:5:7:9: blah blah
[javadoc] c:\MyProject\Polynomial.java:560: error: unknown tag: math
[checkstyle] [ERROR] /src/Test.java:38: warning: foo: bar
* Bash v2

7
lisp/progmodes/compile.el
View file

@ -181,9 +181,12 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
(aix
" in line \\([0-9]+\\) of file \\([^ \n]+[^. \n]\\)\\.? " 2 1)
;; Checkstyle task may report its own severity level: "[checkstyle] [ERROR] ..."
;; (see AuditEventDefaultFormatter.java in checkstyle sources).
(ant
"^[ \t]*\\[[^] \n]+\\][ \t]*\\(\\(?:[A-Za-z]:\\\\\\)?[^: \n]+\\):\\([0-9]+\\):\\(?:\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\):\\)?\
\\( warning\\)?" 1 (2 . 4) (3 . 5) (6))
"^[ \t]*\\(?:\\[[^] \n]+\\][ \t]*\\)\\{1,2\\}\\(\\(?:[A-Za-z]:\\)?[^: \n]+\\):\
\\([0-9]+\\):\\(?:\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\):\\)?\\( warning\\)?"
1 (2 . 4) (3 . 5) (6))
(bash
"^\\([^: \n\t]+\\): line \\([0-9]+\\):" 1 2)

18
test/lisp/progmodes/compile-tests.el
View file

@ -55,11 +55,19 @@
25 nil 8 "errors.c")
;; ant
("[javac] /src/DataBaseTestCase.java:27: unreported exception ..."
13 nil 27 "/src/DataBaseTestCase.java")
13 nil 27 "/src/DataBaseTestCase.java" 2)
("[javac] /src/DataBaseTestCase.java:49: warning: finally clause cannot complete normally"
13 nil 49 "/src/DataBaseTestCase.java")
13 nil 49 "/src/DataBaseTestCase.java" 1)
("[jikes] foo.java:3:5:7:9: blah blah"
14 (5 . 10) (3 . 7) "foo.java")
14 (5 . 10) (3 . 7) "foo.java" 2)
("[javac] c:/cygwin/Test.java:12: error: foo: bar"
9 nil 12 "c:/cygwin/Test.java" 2)
("[javac] c:\\cygwin\\Test.java:87: error: foo: bar"
9 nil 87 "c:\\cygwin\\Test.java" 2)
;; Checkstyle error, but ant reports a warning (note additional
;; severity level after task name)
("[checkstyle] [ERROR] /src/Test.java:38: warning: foo"
22 nil 38 "/src/Test.java" 1)
;; bash
("a.sh: line 1: ls-l: command not found"
1 nil 1 "a.sh")
@ -420,8 +428,8 @@ The test data is in `compile-tests--test-regexps-data'."
(compilation-num-warnings-found 0)
(compilation-num-infos-found 0))
(mapc #'compile--test-error-line compile-tests--test-regexps-data)
(should (eq compilation-num-errors-found 90))
(should (eq compilation-num-warnings-found 35))
(should (eq compilation-num-errors-found 92))
(should (eq compilation-num-warnings-found 36))
(should (eq compilation-num-infos-found 26)))))
(ert-deftest compile-test-grep-regexps ()