diff options
| author | Jon Gjengset <jon@thesquareplanet.com> | 2017-05-31 13:16:49 -0400 |
|---|---|---|
| committer | w0rp <w0rp@users.noreply.github.com> | 2017-05-31 18:16:49 +0100 |
| commit | 88948e0ee3729b9b31b7cfd7e0efd5fe15143621 (patch) | |
| tree | b92942c9a33cf6f23d1b7d053cff5d3cc3b28f7a | |
| parent | 42efd517232c3f62289910e53f1d2fe2549196cf (diff) | |
| download | ale-88948e0ee3729b9b31b7cfd7e0efd5fe15143621.zip | |
Include span label in rust lints (#601)
* Include span label in rust lints
This turns relatively unhelpful error messages like
mismatched types
into more expressive messages along the lines of
mismatched types: expected bool, found integral variable
Fixes #597.
* Exclude rust lint span label if empty
* Use single-quoted strings in vimscript
* Add test for detailed rust errors
* Prune Cargo JSON
* Use matching error file name
* Byte offsets not char offsets
| -rw-r--r-- | autoload/ale/handlers/rust.vim | 2 | ||||
| -rw-r--r-- | test/handler/test_rust_handler.vader | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/autoload/ale/handlers/rust.vim b/autoload/ale/handlers/rust.vim index 5781e619..47b3c7f2 100644 --- a/autoload/ale/handlers/rust.vim +++ b/autoload/ale/handlers/rust.vim @@ -55,7 +55,7 @@ function! ale#handlers#rust#HandleRustErrorsForFile(buffer, full_filename, lines \ 'end_lnum': l:span.line_end, \ 'col': l:span.byte_start, \ 'end_col': l:span.byte_end, - \ 'text': l:error.message, + \ 'text': empty(l:span.label) ? l:error.message : printf('%s: %s', l:error.message, l:span.label), \ 'type': toupper(l:error.level[0]), \}) else diff --git a/test/handler/test_rust_handler.vader b/test/handler/test_rust_handler.vader index 38228f38..11dcf17f 100644 --- a/test/handler/test_rust_handler.vader +++ b/test/handler/test_rust_handler.vader @@ -55,6 +55,25 @@ Execute(The Rust handler should handle cargo output): \ '{"message":{"children":[],"code":null,"level":"error","message":"aborting due to previous error","rendered":null,"spans":[]},"package_id":"update 0.0.1 (path+file:///home/w0rp/Downloads/rust-by-example)","reason":"compiler-message","target":{"kind":["bin"],"name":"update","src_path":"/home/w0rp/Downloads/rust-by-example/src/main.rs"}}', \ ]) +Execute(The Rust handler should show detailed errors): + AssertEqual + \ [ + \ { + \ 'lnum': 4, + \ 'end_lnum': 4, + \ 'type': 'E', + \ 'col': 52, + \ 'end_col': 54, + \ 'text': 'mismatched types: expected bool, found integral variable', + \ }, + \ ], + \ ale#handlers#rust#HandleRustErrorsForFile(347, 'src/playpen.rs', [ + \ '', + \ 'ignore this', + \ '{"message":{"children":[],"code":null,"level":"error","message":"mismatched types","rendered":null,"spans":[{"byte_end":54,"byte_start":52,"column_end":23,"column_start":21,"expansion":null,"file_name":"src/playpen.rs","is_primary":true,"label":"expected bool, found integral variable","line_end":4,"line_start":4,"suggested_replacement":null,"text":[{"highlight_end":23,"highlight_start":21,"text":" let foo: bool = 42;"}]}]},"package_id":"ale-rust-details 0.1.1 (path+file:///home/jon/tmp/ale-rust-details)","reason":"compiler-message","target":{"crate_types":["bin"],"kind":["bin"],"name":"ale-rust-details","src_path":"/home/jon/tmp/ale-rust-details/src/main.rs"}}', + \ '{"message":{"children":[],"code":null,"level":"error","message":"aborting due to previous error(s)","rendered":null,"spans":[]},"package_id":"ale-rust-details 0.1.1 (path+file:///home/jon/tmp/ale-rust-details)","reason":"compiler-message","target":{"crate_types":["bin"],"kind":["bin"],"name":"ale-rust-details","src_path":"/home/jon/tmp/ale-rust-details/src/main.rs"}}', + \ ]) + Execute(The Rust handler should find correct files): AssertEqual \ [], |