vim/ale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2325 from rustic-games/rust-spans

Browse Source 
set correct Rust span end column
This commit is contained in:
w0rp 2019-03-08 20:23:42 +00:00 committed by GitHub
commit be2c0c3af5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/ale/handlers/rust.vim
View File

@ -60,7 +60,7 @@ function! ale#handlers#rust#HandleRustErrors(buffer, lines) abort
\ 'lnum': l:span.line_start, \ 'lnum': l:span.line_start,
\ 'end_lnum': l:span.line_end, \ 'end_lnum': l:span.line_end,
\ 'col': l:span.column_start, \ 'col': l:span.column_start,
\ 'end_col': l:span.column_end, \ 'end_col': l:span.column_end-1,
\ 'text': empty(l:span.label) ? l:error.message : printf('%s: %s', l:error.message, l:span.label), \ 'text': empty(l:span.label) ? l:error.message : printf('%s: %s', l:error.message, l:span.label),
\ 'type': toupper(l:error.level[0]), \ 'type': toupper(l:error.level[0]),
\}) \})

18
test/handler/test_rust_handler.vader
View File

@ -8,7 +8,7 @@ Execute(The Rust handler should handle rustc output):
\ 'end_lnum': 15, \ 'end_lnum': 15,
\ 'type': 'E', \ 'type': 'E',
\ 'col': 5, \ 'col': 5,
\ 'end_col': 8, \ 'end_col': 7,
\ 'text': 'expected one of `.`, `;`, `?`, `}`, or an operator, found `for`', \ 'text': 'expected one of `.`, `;`, `?`, `}`, or an operator, found `for`',
\ }, \ },
\ { \ {
@ -16,7 +16,7 @@ Execute(The Rust handler should handle rustc output):
\ 'end_lnum': 13, \ 'end_lnum': 13,
\ 'type': 'E', \ 'type': 'E',
\ 'col': 7, \ 'col': 7,
\ 'end_col': 10, \ 'end_col': 9,
\ 'text': 'no method named `wat` found for type `std::string::String` in the current scope', \ 'text': 'no method named `wat` found for type `std::string::String` in the current scope',
\ }, \ },
\ ], \ ],
@ -84,7 +84,7 @@ Execute(The Rust handler should handle cargo output):
\ 'end_lnum': 15, \ 'end_lnum': 15,
\ 'type': 'E', \ 'type': 'E',
\ 'col': 5, \ 'col': 5,
\ 'end_col': 8, \ 'end_col': 7,
\ 'text': 'expected one of `.`, `;`, `?`, `}`, or an operator, found `for`', \ 'text': 'expected one of `.`, `;`, `?`, `}`, or an operator, found `for`',
\ }, \ },
\ { \ {
@ -92,7 +92,7 @@ Execute(The Rust handler should handle cargo output):
\ 'end_lnum': 13, \ 'end_lnum': 13,
\ 'type': 'E', \ 'type': 'E',
\ 'col': 7, \ 'col': 7,
\ 'end_col': 10, \ 'end_col': 9,
\ 'text': 'no method named `wat` found for type `std::string::String` in the current scope', \ 'text': 'no method named `wat` found for type `std::string::String` in the current scope',
\ }, \ },
\ ], \ ],
@ -158,7 +158,7 @@ Execute(The Rust handler should should errors from expansion spans):
\ 'end_lnum': 4, \ 'end_lnum': 4,
\ 'type': 'E', \ 'type': 'E',
\ 'col': 21, \ 'col': 21,
\ 'end_col': 23, \ 'end_col': 22,
\ 'text': 'mismatched types: expected bool, found integral variable', \ 'text': 'mismatched types: expected bool, found integral variable',
\ }, \ },
\ ], \ ],
@ -208,7 +208,7 @@ Execute(The Rust handler should show detailed errors):
\ 'end_lnum': 4, \ 'end_lnum': 4,
\ 'type': 'E', \ 'type': 'E',
\ 'col': 21, \ 'col': 21,
\ 'end_col': 23, \ 'end_col': 22,
\ 'text': 'mismatched types: expected bool, found integral variable', \ 'text': 'mismatched types: expected bool, found integral variable',
\ }, \ },
\ ], \ ],
@ -296,7 +296,7 @@ Execute(The Rust handler should remove secondary spans if set):
\ 'lnum': 1, \ 'lnum': 1,
\ 'end_lnum': 1, \ 'end_lnum': 1,
\ 'type': 'E', \ 'type': 'E',
\ 'end_col': 21, \ 'end_col': 20,
\ 'col': 1, \ 'col': 1,
\ 'text': 'this function takes 1 parameter but 0 were supplied: defined here', \ 'text': 'this function takes 1 parameter but 0 were supplied: defined here',
\ }, \ },
@ -304,7 +304,7 @@ Execute(The Rust handler should remove secondary spans if set):
\ 'lnum': 1, \ 'lnum': 1,
\ 'end_lnum': 1, \ 'end_lnum': 1,
\ 'type': 'E', \ 'type': 'E',
\ 'end_col': 46, \ 'end_col': 45,
\ 'col': 40, \ 'col': 40,
\ 'text': 'this function takes 1 parameter but 0 were supplied: expected 1 parameter', \ 'text': 'this function takes 1 parameter but 0 were supplied: expected 1 parameter',
\ }, \ },
@ -371,7 +371,7 @@ Execute(The Rust handler should remove secondary spans if set):
\ 'lnum': 1, \ 'lnum': 1,
\ 'end_lnum': 1, \ 'end_lnum': 1,
\ 'type': 'E', \ 'type': 'E',
\ 'end_col': 46, \ 'end_col': 45,
\ 'col': 40, \ 'col': 40,
\ 'text': 'this function takes 1 parameter but 0 were supplied: expected 1 parameter', \ 'text': 'this function takes 1 parameter but 0 were supplied: expected 1 parameter',
\ }, \ },