summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lazarus <nerdrew@gmail.com>2019-06-04 21:54:26 -0700
committerAndrew Lazarus <nerdrew@gmail.com>2019-06-04 22:20:57 -0700
commite7317e05ea3e18d39feb4620a93c8ceec25d8a43 (patch)
tree2578dc2c06a53b16a74d237915a9ab116822628e
parent381fff0e4c0c7c5057ed0d114169fac3a419ff85 (diff)
downloadale-e7317e05ea3e18d39feb4620a93c8ceec25d8a43.zip
show rendered cargo error in detail
-rw-r--r--autoload/ale/handlers/rust.vim10
-rw-r--r--test/handler/test_rust_handler.vader51
2 files changed, 59 insertions, 2 deletions
diff --git a/autoload/ale/handlers/rust.vim b/autoload/ale/handlers/rust.vim
index dda6466e..a7fac464 100644
--- a/autoload/ale/handlers/rust.vim
+++ b/autoload/ale/handlers/rust.vim
@@ -56,14 +56,20 @@ function! ale#handlers#rust#HandleRustErrors(buffer, lines) abort
endif
if !empty(l:span)
- call add(l:output, {
+ let l:output_line = {
\ 'lnum': l:span.line_start,
\ 'end_lnum': l:span.line_end,
\ 'col': l:span.column_start,
\ 'end_col': l:span.column_end-1,
\ 'text': empty(l:span.label) ? l:error.message : printf('%s: %s', l:error.message, l:span.label),
\ 'type': toupper(l:error.level[0]),
- \})
+ \}
+
+ if has_key(l:error, 'rendered') && !empty(l:error.rendered)
+ let l:output_line.detail = l:error.rendered
+ endif
+
+ call add(l:output, l:output_line)
endif
endfor
endfor
diff --git a/test/handler/test_rust_handler.vader b/test/handler/test_rust_handler.vader
index 56db9b36..845df2b5 100644
--- a/test/handler/test_rust_handler.vader
+++ b/test/handler/test_rust_handler.vader
@@ -247,6 +247,57 @@ Execute(The Rust handler should show detailed errors):
\ }),
\ ])
+Execute(The Rust handler should show detailed clippy errors with rendered field if it's available):
+ call ale#test#SetFilename('src/playpen.rs')
+
+ AssertEqual
+ \ [
+ \ {
+ \ 'lnum': 4,
+ \ 'end_lnum': 4,
+ \ 'type': 'E',
+ \ 'col': 21,
+ \ 'end_col': 22,
+ \ 'text': 'mismatched types: expected bool, found integral variable',
+ \ 'detail': 'this is a detailed description',
+ \ },
+ \ ],
+ \ ale#handlers#rust#HandleRustErrors(bufnr(''), [
+ \ '',
+ \ 'ignore this',
+ \ json_encode({
+ \ 'message': {
+ \ 'code': v:null,
+ \ 'level': 'error',
+ \ 'message': 'mismatched types',
+ \ 'rendered': 'this is a detailed description',
+ \ 'spans': [
+ \ {
+ \ 'byte_end': 54,
+ \ 'byte_start': 52,
+ \ 'column_end': 23,
+ \ 'column_start': 21,
+ \ 'expansion': v:null,
+ \ 'file_name': ale#path#Simplify('src/playpen.rs'),
+ \ 'is_primary': v:true,
+ \ 'label': 'expected bool, found integral variable',
+ \ 'line_end': 4,
+ \ 'line_start': 4,
+ \ }
+ \ ]
+ \ },
+ \ }),
+ \ json_encode({
+ \ 'message': {
+ \ 'code': v:null,
+ \ 'level': 'error',
+ \ 'message': 'aborting due to previous error(s)',
+ \ 'spans': [
+ \ ]
+ \ },
+ \ }),
+ \ ])
+
Execute(The Rust handler should find correct files):
call ale#test#SetFilename('src/noerrors/mod.rs')