diff options
| author | Jethro Shuwen Sun <jethro.sun7@gmail.com> | 2019-04-15 09:36:18 -0400 |
|---|---|---|
| committer | w0rp <w0rp@users.noreply.github.com> | 2019-04-15 14:36:18 +0100 |
| commit | 7f31065fce89cca492c21c8bd73c74aa9f9432b2 (patch) | |
| tree | 2f385d021a66b0d426948f5d4cd86fd8b75657d2 | |
| parent | 61c1ddd90429c2604867358aedc2456b560845f9 (diff) | |
| download | ale-7f31065fce89cca492c21c8bd73c74aa9f9432b2.zip | |
improve the lsp diagnostic message format (#2425)
| -rw-r--r-- | autoload/ale/lsp/response.vim | 2 | ||||
| -rw-r--r-- | test/lsp/test_read_lsp_diagnostics.vader | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/autoload/ale/lsp/response.vim b/autoload/ale/lsp/response.vim index b91d875b..9ce05260 100644 --- a/autoload/ale/lsp/response.vim +++ b/autoload/ale/lsp/response.vim @@ -28,7 +28,7 @@ function! ale#lsp#response#ReadDiagnostics(response) abort for l:diagnostic in a:response.params.diagnostics let l:severity = get(l:diagnostic, 'severity', 0) let l:loclist_item = { - \ 'text': l:diagnostic.message, + \ 'text': substitute(l:diagnostic.message, '\(\r\n\|\n\|\r\)', ' ', 'g'), \ 'type': 'E', \ 'lnum': l:diagnostic.range.start.line + 1, \ 'col': l:diagnostic.range.start.character + 1, diff --git a/test/lsp/test_read_lsp_diagnostics.vader b/test/lsp/test_read_lsp_diagnostics.vader index c197e0c6..377e73d9 100644 --- a/test/lsp/test_read_lsp_diagnostics.vader +++ b/test/lsp/test_read_lsp_diagnostics.vader @@ -109,6 +109,26 @@ Execute(ale#lsp#response#ReadDiagnostics() should include sources in detail): \ } \ ]}}) +Execute(ale#lsp#response#ReadDiagnostics() should keep detail with line breaks but replace with spaces in text): + AssertEqual [ + \ { + \ 'type': 'E', + \ 'text': 'cannot borrow `cap` as mutable more than once at a time mutable borrow starts here in previous iteration of loop', + \ 'detail': "[rustc] cannot borrow `cap` as mutable\r\nmore than once at a time\n\nmutable borrow starts here\rin previous iteration of loop", + \ 'lnum': 10, + \ 'col': 15, + \ 'end_lnum': 12, + \ 'end_col': 22, + \ } + \ ], + \ ale#lsp#response#ReadDiagnostics({'params': {'uri': 'filename.ts', 'diagnostics': [ + \ { + \ 'range': Range(9, 14, 11, 22), + \ 'message': "cannot borrow `cap` as mutable\r\nmore than once at a time\n\nmutable borrow starts here\rin previous iteration of loop", + \ 'source': 'rustc', + \ } + \ ]}}) + Execute(ale#lsp#response#ReadDiagnostics() should consider -1 to be a meaningless code): AssertEqual [ \ { |