diff options
| author | Filipp Gunbin | 2019-10-29 23:06:20 +0300 |
|---|---|---|
| committer | Filipp Gunbin | 2019-10-29 23:06:20 +0300 |
| commit | 6d2c73e8c725863db5d4fbbf1a59e35ebaa5f6b4 (patch) | |
| tree | d30a8709173a1d3eed4790eef50c64ced3df2b7c | |
| parent | dafc87efd0b8ef941aa4e11986095a98fce536e1 (diff) | |
| download | emacs-6d2c73e8c725863db5d4fbbf1a59e35ebaa5f6b4.tar.gz emacs-6d2c73e8c725863db5d4fbbf1a59e35ebaa5f6b4.zip | |
Add gradle-kotlin to compilation-error-regexp-alist-alist
* lisp/progmodes/compile.el: Add gradle-kotlin to
compilation-error-regexp-alist-alist.
* etc/compilation.txt: Add samples for it.
| -rw-r--r-- | etc/compilation.txt | 8 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 10 | ||||
| -rw-r--r-- | test/lisp/progmodes/compile-tests.el | 11 |
3 files changed, 27 insertions, 2 deletions
diff --git a/etc/compilation.txt b/etc/compilation.txt index 0e39ab5e4af..4a4a318d031 100644 --- a/etc/compilation.txt +++ b/etc/compilation.txt | |||
| @@ -185,6 +185,14 @@ Warning near line 10 file arrayclash.f: Module contains no executable | |||
| 185 | Nonportable usage near line 31 col 9 file assign.f: mixed default and explicit | 185 | Nonportable usage near line 31 col 9 file assign.f: mixed default and explicit |
| 186 | 186 | ||
| 187 | 187 | ||
| 188 | * Gradle with kotlin-gradle-plugin | ||
| 189 | |||
| 190 | symbol: gradle-kotlin | ||
| 191 | |||
| 192 | e: /src/Test.kt: (34, 15): foo: bar | ||
| 193 | w: /src/Test.kt: (34, 15): foo: bar | ||
| 194 | |||
| 195 | |||
| 188 | * IAR Systems C Compiler | 196 | * IAR Systems C Compiler |
| 189 | 197 | ||
| 190 | symbol: iar | 198 | symbol: iar |
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index cd7a5dc677e..b0bb728de0e 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el | |||
| @@ -236,6 +236,16 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1)) | |||
| 236 | "\\(^Warning .*\\)? line[ \n]\\([0-9]+\\)[ \n]\\(?:col \\([0-9]+\\)[ \n]\\)?file \\([^ :;\n]+\\)" | 236 | "\\(^Warning .*\\)? line[ \n]\\([0-9]+\\)[ \n]\\(?:col \\([0-9]+\\)[ \n]\\)?file \\([^ :;\n]+\\)" |
| 237 | 4 2 3 (1)) | 237 | 4 2 3 (1)) |
| 238 | 238 | ||
| 239 | ;; Gradle with kotlin-gradle-plugin (see | ||
| 240 | ;; GradleStyleMessagerRenderer.kt in kotlin sources, see | ||
| 241 | ;; https://youtrack.jetbrains.com/issue/KT-34683). | ||
| 242 | (gradle-kotlin | ||
| 243 | ,(concat | ||
| 244 | "^\\(?:\\(w\\)\\|.\\): *" ;type | ||
| 245 | "\\(\\(?:[A-Za-z]:\\)?[^:\n]+\\): *" ;file | ||
| 246 | "(\\([0-9]+\\), *\\([0-9]+\\))") ;line, column | ||
| 247 | 2 3 4 (1)) | ||
| 248 | |||
| 239 | (iar | 249 | (iar |
| 240 | "^\"\\(.*\\)\",\\([0-9]+\\)\\s-+\\(?:Error\\|Warnin\\(g\\)\\)\\[[0-9]+\\]:" | 250 | "^\"\\(.*\\)\",\\([0-9]+\\)\\s-+\\(?:Error\\|Warnin\\(g\\)\\)\\[[0-9]+\\]:" |
| 241 | 1 2 nil (3)) | 251 | 1 2 nil (3)) |
diff --git a/test/lisp/progmodes/compile-tests.el b/test/lisp/progmodes/compile-tests.el index 08a369e7b54..e38c31dd0a4 100644 --- a/test/lisp/progmodes/compile-tests.el +++ b/test/lisp/progmodes/compile-tests.el | |||
| @@ -212,6 +212,13 @@ | |||
| 212 | 1 nil 27041 "{standard input}") | 212 | 1 nil 27041 "{standard input}") |
| 213 | ("boost/container/detail/flat_tree.hpp:589:25: [ skipping 5 instantiation contexts, use -ftemplate-backtrace-limit=0 to disable ]" | 213 | ("boost/container/detail/flat_tree.hpp:589:25: [ skipping 5 instantiation contexts, use -ftemplate-backtrace-limit=0 to disable ]" |
| 214 | 1 25 589 "boost/container/detail/flat_tree.hpp" 0) | 214 | 1 25 589 "boost/container/detail/flat_tree.hpp" 0) |
| 215 | ;; gradle-kotlin | ||
| 216 | ("e: /src/Test.kt: (34, 15): foo: bar" 4 15 34 "/src/Test.kt" 2) | ||
| 217 | ("w: /src/Test.kt: (11, 98): foo: bar" 4 98 11 "/src/Test.kt" 1) | ||
| 218 | ("e: e:/cygwin/src/Test.kt: (34, 15): foo: bar" 4 15 34 "e:/cygwin/src/Test.kt" 2) | ||
| 219 | ("w: e:/cygwin/src/Test.kt: (11, 98): foo: bar" 4 98 11 "e:/cygwin/src/Test.kt" 1) | ||
| 220 | ("e: e:\\src\\Test.kt: (34, 15): foo: bar" 4 15 34 "e:\\src\\Test.kt" 2) | ||
| 221 | ("w: e:\\src\\Test.kt: (11, 98): foo: bar" 4 98 11 "e:\\src\\Test.kt" 1) | ||
| 215 | ;; Guile | 222 | ;; Guile |
| 216 | ("In foo.scm:\n" 1 nil nil "foo.scm") | 223 | ("In foo.scm:\n" 1 nil nil "foo.scm") |
| 217 | (" 63:4 [call-with-prompt prompt0 ...]" 1 4 63 nil) | 224 | (" 63:4 [call-with-prompt prompt0 ...]" 1 4 63 nil) |
| @@ -413,8 +420,8 @@ The test data is in `compile-tests--test-regexps-data'." | |||
| 413 | (compilation-num-warnings-found 0) | 420 | (compilation-num-warnings-found 0) |
| 414 | (compilation-num-infos-found 0)) | 421 | (compilation-num-infos-found 0)) |
| 415 | (mapc #'compile--test-error-line compile-tests--test-regexps-data) | 422 | (mapc #'compile--test-error-line compile-tests--test-regexps-data) |
| 416 | (should (eq compilation-num-errors-found 87)) | 423 | (should (eq compilation-num-errors-found 90)) |
| 417 | (should (eq compilation-num-warnings-found 32)) | 424 | (should (eq compilation-num-warnings-found 35)) |
| 418 | (should (eq compilation-num-infos-found 26))))) | 425 | (should (eq compilation-num-infos-found 26))))) |
| 419 | 426 | ||
| 420 | (ert-deftest compile-test-grep-regexps () | 427 | (ert-deftest compile-test-grep-regexps () |